From 88d270f62e268c4cd36bc6e181ee885e21167376 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 01:06:04 -0700
Subject: [PATCH 1/3] grub2: Add localizations
---
pkgs/tools/misc/grub/2.0x.nix | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index fdb2ae556e8d..e5471a6c404c 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -22,6 +22,13 @@ let
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
+
+ po_src = fetchurl {
+ name = "grub-2.02-beta2.tar.gz";
+ url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz";
+ sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm";
+ };
+
in (
assert efiSupport -> canEfi;
@@ -61,7 +68,10 @@ stdenv.mkDerivation rec {
'';
prePatch =
- '' sh autogen.sh
+ '' tar zxf ${po_src} grub-2.02~beta2/po
+ rm -rf po
+ mv grub-2.02~beta2/po po
+ sh autogen.sh
gunzip < "${unifont_bdf}" > "unifont.bdf"
sed -i "configure" \
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
From 1b63a1b75e5d7e1f84c3d7222ca504f6394a3a8b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 09:26:44 -0700
Subject: [PATCH 2/3] nixos/iso-image: Fix grub-mkimage requiring a prefix
---
nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 623cfdedd269..22f31c460802 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -11,7 +11,7 @@ let
# The Grub image.
grubImage = pkgs.runCommand "grub_eltorito" {}
''
- ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
+ ${pkgs.grub2}/bin/grub-mkimage -p /boot/grub -O i386-pc -o tmp biosdisk iso9660 help linux linux16 chain png jpeg echo gfxmenu reboot
cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
''; # */
From eee8fd89b34b40532f90ab6d87214130abfa0e02 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 3 Sep 2014 09:29:22 -0700
Subject: [PATCH 3/3] nixos/install-grub: Correct store path for search
---
nixos/modules/system/boot/loader/grub/install-grub.pl | 7 +++----
1 file changed, 3 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 668e74a9722e..2dad8b36db32 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -122,7 +122,7 @@ sub GrubFs {
# Based on the type pull in the identifier from the system
my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}");
if ($status != 0) {
- die "Failed to get blkid info for @{[$fs->device]}";
+ die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}";
}
my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/;
if ($#matches != 0) {
@@ -164,8 +164,7 @@ sub GrubFs {
return Grub->new(path => $path, search => $search);
}
my $grubBoot = GrubFs("/boot");
-# FIXME: Should be /nix/store, but this fails in the installer
-my $grubStore = GrubFs("/nix");
+my $grubStore = GrubFs("/nix/store");
# Generate the header.
my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n";
@@ -244,7 +243,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels;
sub copyToKernelsDir {
my ($path) = @_;
- return $grubStore->path . substr($path, length("/nix")) unless $copyKernels;
+ return $grubStore->path . substr($path, length("/nix/store")) unless $copyKernels;
$path =~ /\/nix\/store\/(.*)/ or die;
my $name = $1; $name =~ s/\//-/g;
my $dst = "/boot/kernels/$name";