Mercurial > illumos > illumos-gate
changeset 10723:e94d9b4f958f
6805690 enabling vntsd in factory-default mode causes unnecessary warning messages
author | Zach Kissel <Zachary.Kissel@Sun.COM> |
---|---|
date | Tue, 06 Oct 2009 14:40:10 -0400 |
parents | ead952aa2ab7 |
children | 46ad20cc31ef |
files | usr/src/cmd/vntsd/svc-vntsd |
diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/vntsd/svc-vntsd Tue Oct 06 00:29:15 2009 -0400 +++ b/usr/src/cmd/vntsd/svc-vntsd Tue Oct 06 14:40:10 2009 -0400 @@ -131,6 +131,23 @@ args="$args -A" fi +# +# If we don't have a vcc device we don't want to try to start vntsd. By default +# newer versions of the factory settings will try to start vntsd by default. +# Since we may be installed on a machine with an older firmware we need to make +# sure that we don't try to start if the virtual console concentrator is not +# present. +# +VNTSD_DEV='/devices/virtual-devices@100/channel-devices@200/virtual-console-concentrator@0:ctl' +if [ ! -c "$VNTSD_DEV" ]; then + echo "The Virtual Network Terminal Server service has been disabled" \ + "because the system has no virtual console concentrator (vcc)" \ + "device." + /usr/sbin/svcadm disable -t "$SMF_FMRI" + sleep 5 & + exit $SMF_EXIT_OK +fi + if [ -x /usr/lib/ldoms/vntsd ]; then /usr/lib/ldoms/vntsd $args rc=$?