summary refs log tree commit diff
path: root/nixos/modules/system/boot/loader/grub
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-02-12 13:14:34 +0100
committerPeter Simons <simons@cryp.to>2016-02-12 13:14:34 +0100
commita1fa485378f3c17946c138935fd46be2178da389 (patch)
tree754935966deb6433cb95cdbb1780c72fe6861de0 /nixos/modules/system/boot/loader/grub
parent7bd6fc90cbdc561afc17550290aea6b819a71189 (diff)
downloadnixlib-a1fa485378f3c17946c138935fd46be2178da389.tar
nixlib-a1fa485378f3c17946c138935fd46be2178da389.tar.gz
nixlib-a1fa485378f3c17946c138935fd46be2178da389.tar.bz2
nixlib-a1fa485378f3c17946c138935fd46be2178da389.tar.lz
nixlib-a1fa485378f3c17946c138935fd46be2178da389.tar.xz
nixlib-a1fa485378f3c17946c138935fd46be2178da389.tar.zst
nixlib-a1fa485378f3c17946c138935fd46be2178da389.zip
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
Diffstat (limited to 'nixos/modules/system/boot/loader/grub')
-rw-r--r--nixos/modules/system/boot/loader/grub/install-grub.pl8
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 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