diff options
| author | Ben Booth <benwbooth@gmail.com> | 2016-02-11 12:05:15 -0800 |
|---|---|---|
| committer | Ben Booth <benwbooth@gmail.com> | 2016-02-11 12:05:15 -0800 |
| commit | b861bf8ddff677031e93a8e1c55311be63e0eb63 (patch) | |
| tree | 77f052ec8ac0b302b308baf5dd8ac1a62cc8b84e /nixos/modules/system/boot | |
| parent | fce433a6c04237d64037b48744e1cb6abf5cf8e7 (diff) | |
| download | nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar.gz nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar.bz2 nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar.lz nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar.xz nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.tar.zst nixlib-b861bf8ddff677031e93a8e1c55311be63e0eb63.zip | |
Remove double-backslashes from grub conf file
The double-backspashes in the splashimage, kernel, and initrd sections serve no purpose and confuse pygrub
Diffstat (limited to 'nixos/modules/system/boot')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b8ef02da4bc2..8da564bda150 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -228,7 +228,7 @@ if ($grubVersion == 1) { "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n"; - $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; + $conf .= "splashimage " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n"; } } @@ -327,9 +327,9 @@ sub addEntry { my ($name, $path) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; - my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); - my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); - my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; + my $kernel = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/kernel"))); + my $initrd = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/initrd"))); + my $xen = -e "$path/xen.gz" ? Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/xen.gz"))) : undef; # FIXME: $confName |