diff options
| -rw-r--r-- | etc/rc | 2 | ||||
| -rw-r--r-- | sbin/reboot/reboot.c | 2 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -316,7 +316,7 @@ fi # If we booted a special kernel remove the record so we will boot # the default kernel next time -rm -f /boot/nextkernel +rm -f /boot/nextboot.conf # Reseed /dev/random with previously stored entropy. case ${entropy_dir} in diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index be8911fbd84e..7f42e5625cdd 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -123,7 +123,7 @@ main(int argc, char *argv[]) } if (kflag) { - fd = open("/boot/nextkernel", O_WRONLY | O_CREAT, 0444); + fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT, 0444); if (fd > -1) { (void)write(fd, "kernel=\"", 8L); (void)write(fd, kernel, strlen(kernel)); diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index c1427226205c..4b636f8dd06f 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -22,7 +22,7 @@ userconfig_script_load="NO" userconfig_script_name="/boot/kernel.conf" userconfig_script_type="userconfig_script" -loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextkernel" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output |