summaryrefslogtreecommitdiff
path: root/usr/src/cmd/vntsd
diff options
context:
space:
mode:
authorZach Kissel <Zachary.Kissel@Sun.COM>2009-10-06 14:40:10 -0400
committerZach Kissel <Zachary.Kissel@Sun.COM>2009-10-06 14:40:10 -0400
commit25b895bc9d3dbeb672f8d067af54c94268c932e5 (patch)
tree97ba1bf0b2c7a974620b9244bb58fe69cf492c3b /usr/src/cmd/vntsd
parentd501bbfebe95a313ee5e78368177b1667a71c628 (diff)
downloadillumos-gate-25b895bc9d3dbeb672f8d067af54c94268c932e5.tar.gz
6805690 enabling vntsd in factory-default mode causes unnecessary warning messages
Diffstat (limited to 'usr/src/cmd/vntsd')
-rw-r--r--usr/src/cmd/vntsd/svc-vntsd17
1 files changed, 17 insertions, 0 deletions
diff --git a/usr/src/cmd/vntsd/svc-vntsd b/usr/src/cmd/vntsd/svc-vntsd
index 411215f457..988fa2d6c3 100644
--- a/usr/src/cmd/vntsd/svc-vntsd
+++ b/usr/src/cmd/vntsd/svc-vntsd
@@ -131,6 +131,23 @@ if [ "$auth" = "true" ]; then
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=$?