BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3892 from robberer/bugfix/grub

Browse source 
grub: fix grub merge error
This commit is contained in:
Michael Raskin 2014-08-31 14:34:02 +04:00
commit 6e2b8973e4
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/system/boot/loader/grub/install-grub.pl
View file

@ -178,11 +178,6 @@ sub addEntry {
$conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n";
} else {
$conf .= "menuentry \"$name\" {\n";
<<<<<<< HEAD
$conf .= $grubBoot->search . "\n";
$conf .= $grubStore->search . "\n";
=======
>>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub
$conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig;
$conf .= " multiboot $xen $xenParams\n" if $xen;
$conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";