public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/generate-config: Only add store search path when kernels are not copied

This commit is contained in:
William A. Kennington III 2014-09-01 00:01:41 -07:00
parent 9467937639
commit 961e9867b3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,9 +182,12 @@ if ($grubVersion == 1) {
} }
else { else {
if ($copyKernels == 0) {
$conf .= "
" . $grubStore->search;
}
$conf .= " $conf .= "
" . $grubBoot->search . " " . $grubBoot->search . "
" . $grubStore->search . "
if [ -s \$prefix/grubenv ]; then if [ -s \$prefix/grubenv ]; then
load_env load_env
fi fi
@ -282,7 +285,9 @@ sub addEntry {
} else { } else {
$conf .= "menuentry \"$name\" {\n"; $conf .= "menuentry \"$name\" {\n";
$conf .= $grubBoot->search . "\n"; $conf .= $grubBoot->search . "\n";
$conf .= $grubStore->search . "\n"; if ($copyKernels == 0) {
$conf .= $grubStore->search . "\n";
}
$conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig;
$conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " multiboot $xen $xenParams\n" if $xen;
$conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";