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

grub: fix grub merge error

Browse Source
This commit is contained in:
Longrin Wischnewski 2014-08-31 12:29:13 +02:00
parent ea8910652f
commit 196c6260be
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";