--- a/usr/src/cmd/halt/smf.i386/boot-config.xml	Fri Jun 04 15:30:45 2010 +0800
+++ b/usr/src/cmd/halt/smf.i386/boot-config.xml	Fri Jun 04 01:01:54 2010 -0700
@@ -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' />

--- a/usr/src/cmd/svc/milestone/fs-usr	Fri Jun 04 15:30:45 2010 +0800
+++ b/usr/src/cmd/svc/milestone/fs-usr	Fri Jun 04 01:01:54 2010 -0700
@@ -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 @@
 			/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 ""