ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix grub-reboot

Browse Source
This commit is contained in:
Eelco Dolstra 2015-07-27 01:07:13 +02:00
parent 7e8165b277
commit f07b2121f9
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/modules/system/boot/loader/grub/install-grub.pl
View File

@ -237,6 +237,7 @@ else {
$conf .= " $conf .= "
" . $grubStore->search; " . $grubStore->search;
} }
# FIXME: should use grub-mkconfig.
$conf .= " $conf .= "
" . $grubBoot->search . " " . $grubBoot->search . "
if [ -s \$prefix/grubenv ]; then if [ -s \$prefix/grubenv ]; then
@ -245,14 +246,12 @@ else {
# ‘grub-reboot’ sets a one-time saved entry, which we process here and # ‘grub-reboot’ sets a one-time saved entry, which we process here and
# then delete. # then delete.
if [ \"\${saved_entry}\" ]; then if [ \"\${next_entry}\" ]; then
# The next line *has* to look exactly like this, otherwise KDM's # FIXME: KDM expects the next line to be present.
# reboot feature won't work properly with GRUB 2.
set default=\"\${saved_entry}\" set default=\"\${saved_entry}\"
set saved_entry= set default=\"\${next_entry}\"
set prev_saved_entry= set next_entry=
save_env saved_entry save_env next_entry
save_env prev_saved_entry
set timeout=1 set timeout=1
else else
set default=$defaultEntry set default=$defaultEntry