Rename the file used to specify the nextboot to make it clear that this
is a loader configuration file and can be used for more than just a kernel name. Submitted by: Gordon Tetlow <gordont@gnf.org>
This commit is contained in:
parent
4c421c0b9a
commit
210f257e4e
2
etc/rc
2
etc/rc
@ -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
|
||||
|
@ -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));
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user