diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2015-08-16 14:41:32 -0700 |
|---|---|---|
| committer | Jason King <jason.brian.king@gmail.com> | 2022-03-22 17:32:15 -0500 |
| commit | d3477c6d12fcb86e8bb78faf6993ae16c81cbe12 (patch) | |
| tree | 8ab37da0f2e9707011a390166f062d588d07e38f | |
| parent | f43aa5faf71b05bec443dbb0af363ddeaff8ec17 (diff) | |
| download | illumos-joyent-d3477c6d12fcb86e8bb78faf6993ae16c81cbe12.tar.gz | |
14576 absent framebuffer prevents console-login on all serial ports
Reviewed by: Andy Fiddaman <andy@omnios.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/cmd/svc/milestone/console-login | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/usr/src/cmd/svc/milestone/console-login b/usr/src/cmd/svc/milestone/console-login index 4c87b6332b..81010231b5 100644 --- a/usr/src/cmd/svc/milestone/console-login +++ b/usr/src/cmd/svc/milestone/console-login @@ -23,6 +23,7 @@ # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# Copyright 2015 Joyent, Inc. # # This method script manages all vt logins including system # console login. @@ -38,18 +39,29 @@ . /lib/svc/share/smf_include.sh -if [ "$1" != "default" ]; then - if smf_dont_configure_vt; then - /usr/sbin/svcadm disable $SMF_FMRI - exit $SMF_EXIT_OK - fi -fi - getproparg() { val=`svcprop -p $2 $SMF_FMRI` [ -n "$val" ] && [ "$val" != "\"\"" ] && echo $1 $val } +# The service configuration invokes this script with "%i", the name of the +# instance, as the first argument. +instance="$1" +if [ -z "$instance" ]; then + exit $SMF_EXIT_ERR_CONFIG +fi + +case "$instance" in +vt*) + # This instance is for one of the virtual terminal devices. Check to + # see if the vt subsystem is initialised: + if smf_dont_configure_vt; then + /usr/sbin/svcadm disable "$SMF_FMRI" + exit $SMF_EXIT_OK + fi + ;; +esac + args="-g" val=`svcprop -p ttymon/device $SMF_FMRI` |