Author: shlevy
Date: Sun Mar 18 18:55:47 2012
New Revision: 33241
URL: https://nixos.org/websvn/nix/?rev=33241&sc=1
Log:
You cant modprobe efivars from within the chroot, so modprobe efivars when
booting an efi-compatible install CD
Modified:
nixos/trunk/modules/installer/cd-dvd/iso-image.nix
nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
Modified: nixos/trunk/modules/installer/cd-dvd/iso-image.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/iso-image.nix Sun Mar 18 18:53:50
2012 (r33240)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix Sun Mar 18 18:55:47
2012 (r33241)
@@ -196,6 +196,8 @@
boot.initrd.kernelModules = [ "loop" ];
+ boot.kernelModules = pkgs.stdenv.lib.optional
config.isoImage.makeEfiBootable "efivars":
+
# In stage 1, mount a tmpfs on top of / (the ISO image) and
# /nix/store (the squashfs image) to make this a live CD.
boot.initrd.postMountCommands =
Modified: nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
==============================================================================
--- nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
Sun Mar 18 18:53:50 2012 (r33240)
+++ nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub-builder.sh
Sun Mar 18 18:55:47 2012 (r33241)
@@ -93,7 +93,7 @@
# Remove all old boot manager entries
if test -n "@runEfibootmgr@"; then
set +e
- modprobe efivars
+ modprobe efivars > /dev/null 2>&1
for bootnum in $(efibootmgr | grep "NixOS" | grep "Generation" | sed
's/Boot//' | sed 's/\*.*//'); do
efibootmgr -B -b "$bootnum" > /dev/null 2>&1
done
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
