* grub-mkimage now requires a format flag. Also, the "sh" module has

disappeared.  Hopefully it's not important :-)

svn path=/nixos/trunk/; revision=26234
This commit is contained in:
Eelco Dolstra 2011-03-09 16:26:03 +00:00
parent 12161f3183
commit d8b69f2fad

View file

@ -72,7 +72,7 @@ let
# The Grub image. # The Grub image.
grubImage = pkgs.runCommand "grub_eltorito" {} 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 cat ${pkgs.grub2}/lib/grub/*/cdboot.img tmp > $out
''; # */ ''; # */