Author: eelco
Date: Wed Mar 9 16:26:03 2011
New Revision: 26234
URL: https://svn.nixos.org/websvn/nix/?rev=26234&sc=1
Log:
* grub-mkimage now requires a format flag. Also, the "sh" module has
disappeared. Hopefully it's not important :-)
Modified:
nixos/trunk/modules/installer/cd-dvd/iso-image.nix
Modified: nixos/trunk/modules/installer/cd-dvd/iso-image.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/iso-image.nix Wed Mar 9 15:28:47
2011 (r26233)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix Wed Mar 9 16:26:03
2011 (r26234)
@@ -72,7 +72,7 @@
# The Grub image.
grubImage = pkgs.runCommand "grub_eltorito" {}
''
- ${pkgs.grub2}/bin/grub-mkimage -o tmp biosdisk iso9660 help linux
linux16 sh chain gfxterm vbe png jpeg
+ ${pkgs.grub2}/bin/grub-mkimage -O i386-pc -o tmp biosdisk iso9660 help
linux linux16 chain gfxterm vbe png jpeg
cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
''; # */
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
