d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the file used to specify the nextboot to make it clear that this

Browse Source 
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:
Wes Peters 2002-04-26 22:32:15 +00:00
parent 62efba6a0c
commit 8373917257
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/rc
View File

@ -316,7 +316,7 @@ fi
# If we booted a special kernel remove the record so we will boot # If we booted a special kernel remove the record so we will boot
# the default kernel next time # the default kernel next time
rm -f /boot/nextkernel rm -f /boot/nextboot.conf
# Reseed /dev/random with previously stored entropy. # Reseed /dev/random with previously stored entropy.
case ${entropy_dir} in case ${entropy_dir} in

2
sbin/reboot/reboot.c
View File

@ -123,7 +123,7 @@ main(int argc, char *argv[])
} }
if (kflag) { if (kflag) {
fd = open("/boot/nextkernel", O_WRONLY | O_CREAT, 0444); fd = open("/boot/nextboot.conf", O_WRONLY | O_CREAT, 0444);
if (fd > -1) { if (fd > -1) {
(void)write(fd, "kernel=\"", 8L); (void)write(fd, "kernel=\"", 8L);
(void)write(fd, kernel, strlen(kernel)); (void)write(fd, kernel, strlen(kernel));

2
sys/boot/forth/loader.conf
View File

@ -22,7 +22,7 @@ userconfig_script_load="NO"
userconfig_script_name="/boot/kernel.conf" userconfig_script_name="/boot/kernel.conf"
userconfig_script_type="userconfig_script" 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 verbose_loading="NO" # Set to YES for verbose loader output