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 61deefb..c6b6cb2 100755 (executable)
--- a/common/usr/lib/xen-tools/debian.d/93-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub
@@ -63,18 +63,11 @@ done
 #
 if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
     dpkg --compare-versions "$(chroot ${prefix} lsb_release -rs)" ge 8.10; then
 #
 if [ "$(chroot ${prefix} lsb_release -is)" = "Ubuntu" ] && \
     dpkg --compare-versions "$(chroot ${prefix} lsb_release -rs)" ge 8.10; then

-    sed -i -e 's/xvc0/hvc0/' /etc/event.d/tty1
-    sed -i -e 's/console=ttyS0[^ ]*/console=hvc0/' /boot/grub/menu.lst
+    sed -i -e 's/xvc0/hvc0/' ${prefix}/etc/event.d/tty1
+    sed -i -e 's/console=ttyS0[^ ]*/console=hvc0/' ${prefix}/boot/grub/menu.lst

 fi
 
 #
 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
-#
-sed -i -e 's/indomU=detect/indomU=true/' /boot/grub/menu.lst
-
-#

 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y
 # Regenerate automagic kernels list
 #
 chroot ${prefix} /usr/sbin/update-grub -y