Marius Nuennerich pointed out that nextboot(8) configured boot options

were now sticky.  This script was deleting /boot/nextkernel on boot, but
there is no code in the tree that creates that file since revision 1.15
of src/sbin/reboot/reboot.c.
nextboot(8) creates /boot/nextboot.conf, so remove that instead.

Approved by:	jhb (proxy mentor)
MFC after:	1 week
This commit is contained in:
Ceri Davies 2006-01-15 23:12:26 +00:00
parent d5d399e113
commit f2072da025

View File

@ -34,8 +34,8 @@ root_start()
# If we booted a special kernel remove the record
# so we will boot the default kernel next time.
if [ -e /boot/nextkernel ]; then
rm -f /boot/nextkernel
if [ -e /boot/nextboot.conf ]; then
rm -f /boot/nextboot.conf
fi
}