diff options
| author | ceri <ceri@FreeBSD.org> | 2006-01-15 23:12:26 +0000 |
|---|---|---|
| committer | ceri <ceri@FreeBSD.org> | 2006-01-15 23:12:26 +0000 |
| commit | a415f589c8dc79c0e8a3c21f1c486df07cb79f31 (patch) | |
| tree | 12b4f11ddd344534824ad141f0b366168835ef6c /etc | |
| parent | 022ec5bd3c3f8c91df12da06a41d3d12a5358943 (diff) | |
| download | FreeBSD-src-a415f589c8dc79c0e8a3c21f1c486df07cb79f31.zip FreeBSD-src-a415f589c8dc79c0e8a3c21f1c486df07cb79f31.tar.gz | |
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
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/rc.d/root | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/root b/etc/rc.d/root index 162094c..8b81699 100755 --- a/etc/rc.d/root +++ b/etc/rc.d/root @@ -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 } |
