In invirt-autoinstaller:

[invirt/packages/invirt-autoinstaller.git] / common / usr / lib / xen-tools / debian.d / 93-setup-grub

diff --git a/common/usr/lib/xen-tools/debian.d/93-setup-grub b/common/usr/lib/xen-tools/debian.d/93-setup-grub
index 26fbdda..ce54ad6 100755 (executable)
--- a/common/usr/lib/xen-tools/debian.d/93-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub
@@ -68,6 +68,24 @@ if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
 fi
 
 #
+# If this is a Jaunty machine, the fix from LP #291256 caused our
+# patch to update-grub to not work, so let's use that mechanism
+# instead.
+#
+# Since we haven't run update-grub yet, we need to generate the
+# skeleton of a Debian menu.lst so that update-grub extracts the
+# options correctly
+#
+cat >/boot/grub/menu.lst <<EOF
+### BEGIN AUTOMAGIC KERNELS LIST
+## ## Start Default Options ##
+# indomU=true
+## ## End Default Options ##
+### END DEBIAN AUTOMAGIC KERNELS LIST
+EOF
+sed -i -e 's/indomU=detect/indomU=true/' /boot/grub/menu.lst
+
+#
 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y