pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #3892 from robberer/bugfix/grub

grub: fix grub merge error

Michael Raskin 6e2b8973 ea891065

-5
unified split
-5
nixos/modules/system/boot/loader/grub/install-grub.pl
··· 178 $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; 179 } else { 180 $conf .= "menuentry \"$name\" {\n"; 181 - <<<<<<< HEAD 182 - $conf .= $grubBoot->search . "\n"; 183 - $conf .= $grubStore->search . "\n"; 184 - ======= 185 - >>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub 186 $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; 187 $conf .= " multiboot $xen $xenParams\n" if $xen; 188 $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";
··· 178 $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; 179 } else { 180 $conf .= "menuentry \"$name\" {\n"; 181 $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; 182 $conf .= " multiboot $xen $xenParams\n" if $xen; 183 $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";