From 17213c4f2a4dca5129c39966c808567d2862d6af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 13:11:30 +0000 Subject: [PATCH] * When generating a GRUB 1 menu, don't use the "module" command to load the initrd, because pv-grub doesn't like it. svn path=/nixos/trunk/; revision=24068 --- modules/installer/grub/grub-menu-builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/installer/grub/grub-menu-builder.sh b/modules/installer/grub/grub-menu-builder.sh index 8934c9bd24de..cc82665f2eef 100644 --- a/modules/installer/grub/grub-menu-builder.sh +++ b/modules/installer/grub/grub-menu-builder.sh @@ -200,7 +200,7 @@ title $name @extraPerEntryConfig@ ${xen:+kernel $xen $xenParams} $(if [ -z "$xen" ]; then echo kernel; else echo module; fi) $kernel $kernelParams - module $initrd + $(if [ -z "$xen" ]; then echo initrd; else echo module; fi) $initrd GRUBEND ;; 2)