diff options
| author | wes <wes@FreeBSD.org> | 2002-04-26 07:31:04 +0000 |
|---|---|---|
| committer | wes <wes@FreeBSD.org> | 2002-04-26 07:31:04 +0000 |
| commit | 9bf40bea60a51889f77b8f5c8128b2bebe1a3284 (patch) | |
| tree | 7ead246584ad34442c705cb33fc0bfa686914287 /sys/boot | |
| parent | a83271f3cb64d931c0f89f438d35104acfd34863 (diff) | |
| download | FreeBSD-src-9bf40bea60a51889f77b8f5c8128b2bebe1a3284.zip FreeBSD-src-9bf40bea60a51889f77b8f5c8128b2bebe1a3284.tar.gz | |
Add a -k option to reboot to specify the kernel to boot next time
around. If the kernel boots successfully, the record of this kernel
is erased, it is intended to be a one-shot option for testing
kernels.
This could be improved by having the loader remove the record of
the next kernel to boot, it is currently removed in /etc/rc immediately
after disks are mounted r/w.
I'd like to MFC this before the 4.6 freeze unless there is violent
objection.
Reviewed by: Several on IRC
MFC after: 4 days
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/forth/loader.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 49debbf..aa1d689 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" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextkernel" verbose_loading="NO" # Set to YES for verbose loader output |
