blob: 0485657b96993bab9c3bab7fe763fbb55fb6fb51 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Index: smf-base/usr/src/cmd/svc/milestone/fs-usr
===================================================================
--- smf-base.orig/usr/src/cmd/svc/milestone/fs-usr 2012-10-08 00:25:33.000000000 +0000
+++ smf-base/usr/src/cmd/svc/milestone/fs-usr 2013-01-27 05:03:45.437955507 +0000
@@ -173,28 +173,8 @@
fi
rm -f $UPDATEFILE
bootcmd=`/usr/sbin/eeprom bootcmd | /usr/bin/sed -e 's#bootcmd=##g'`
- if [ `uname -p` = "i386" ]; then
- /usr/sbin/reboot -f dryrun
- if [ $? = 0 ]; then
- /usr/sbin/reboot -f -- "$bootcmd"
- exit $SMF_EXIT_OK
- fi
- 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 ""
- cecho "WARNING: Reboot required."
- cecho "The system has updated the cache of files (boot archive) that is used"
- cecho "during the early boot sequence. To avoid booting and running the system"
- cecho "with the previously out-of-sync version of these files, reboot the"
- cecho "system from the same device that was previously booted."
- cecho ""
- exit $SMF_EXIT_ERR_FATAL
- else
- /usr/sbin/reboot -p
- exit $SMF_EXIT_OK
- fi
- fi
+ echo "Boot archive was updated, system is going to reboot right now." > /dev/msglog
+ sleep 1
/usr/sbin/reboot -- "$bootcmd"
fi
|
