From a1fa485378f3c17946c138935fd46be2178da389 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Feb 2016 13:14:34 +0100 Subject: [PATCH] Revert "Remove double-backslashes from grub conf file". This reverts commit b861bf8ddff67703, because according to @mdorman [1] this change rendered his NixOS systems unbootable, and we probably don't want that. [1] https://github.com/NixOS/nixpkgs/commit/b861bf8ddff677031e93a8e1c55311be63e0eb63#commitcomment-16058598 --- nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++---- 1 file 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 8da564bda150..b8ef02da4bc2 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 " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n"; + $conf .= "splashimage " . $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 = 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; + 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; # FIXME: $confName