summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGangadhar Mylapuram <Gangadhar.M@Sun.COM>2010-06-04 01:01:54 -0700
committerGangadhar Mylapuram <Gangadhar.M@Sun.COM>2010-06-04 01:01:54 -0700
commitabcc7ef9701284c984bd4626e74d300a5de42dc5 (patch)
tree332d2a0d37807a7600fb1a1d268d588e7376f658
parentb22851f1a70ff0ed1ec71258e1089d2f795b2344 (diff)
downloadillumos-joyent-abcc7ef9701284c984bd4626e74d300a5de42dc5.tar.gz
6957186 rename the property "trust-bios-boot-device" of boot-config service to "auto-reboot-safe"
-rw-r--r--usr/src/cmd/halt/smf.i386/boot-config.xml5
-rw-r--r--usr/src/cmd/svc/milestone/fs-usr5
2 files changed, 4 insertions, 6 deletions
diff --git a/usr/src/cmd/halt/smf.i386/boot-config.xml b/usr/src/cmd/halt/smf.i386/boot-config.xml
index 5eed69e7c1..a94ae87454 100644
--- a/usr/src/cmd/halt/smf.i386/boot-config.xml
+++ b/usr/src/cmd/halt/smf.i386/boot-config.xml
@@ -1,8 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
- Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
+ Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
CDDL HEADER START
@@ -90,7 +89,7 @@
<property_group name='config' type='application'>
<stability value='Stable' />
- <propval name='trust-bios-boot-device' type='boolean'
+ <propval name='auto-reboot-safe' type='boolean'
value='false' />
<propval name='fastreboot_default' type='boolean'
value='true' />
diff --git a/usr/src/cmd/svc/milestone/fs-usr b/usr/src/cmd/svc/milestone/fs-usr
index 5b2962ebc3..afcdb24528 100644
--- a/usr/src/cmd/svc/milestone/fs-usr
+++ b/usr/src/cmd/svc/milestone/fs-usr
@@ -20,8 +20,7 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T.
# All rights reserved.
@@ -172,7 +171,7 @@ if [ -f "${UPDATEFILE}" ]; then
/usr/sbin/reboot -f -- "$bootcmd"
exit $SMF_EXIT_OK
fi
- boot_prop=`/usr/sbin/svccfg -s svc:/system/boot-config:default listprop config/trust-bios-boot-device | \
+ boot_prop=`/usr/sbin/svccfg -s svc:/system/boot-config:default listprop config/auto-reboot-safe | \
/usr/bin/nawk '{ print $3}'`
if [ "$boot_prop" != "true" ]; then
cecho ""