From e7799ab47e4d9397a3b4a96f40cbb329bd977296 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Thu, 13 Aug 2009 11:36:13 -0400 Subject: [PATCH] Revert the "Hack to be differently specific". It wasn't working. This reverts commit r2376. svn path=/trunk/packages/invirt-autoinstaller/; revision=2441 --- common/usr/lib/xen-tools/debian.d/93-setup-grub | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 071f61c..d3ba6fd 100755 --- a/common/usr/lib/xen-tools/debian.d/93-setup-grub +++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub @@ -85,7 +85,7 @@ for i in $(seq 1 "$NUMPARTITIONS"); do swap) SWAP_GUEST="$(echo ${!var} | cut -f8 -d:)";; esac done -sed -i -re "s%^([= ]root=)[^ ]*%\1UUID=$ROOT_UUID%" ${prefix}/boot/grub/menu.lst +sed -i -re "s%^(# *kopt=.*root=)[^ ]*%\1UUID=$ROOT_UUID%" ${prefix}/boot/grub/menu.lst sed -i -e "s%${ROOT_GUEST}%UUID=${ROOT_UUID}%" ${prefix}/etc/fstab sed -i -e "s%${SWAP_GUEST}%UUID=${SWAP_UUID}%" ${prefix}/etc/fstab diff --git a/debian/changelog b/debian/changelog index f1b5d24..bdd5899 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-autoinstaller (0.0.32) unstable; urgency=low + + * Revert 0.0.31 - it didn't work, and left autoinstalled VMs that used + to work without anything in their grub menu.lst. + + -- Evan Broder Thu, 13 Aug 2009 08:35:50 -0700 + invirt-autoinstaller (0.0.31) unstable; urgency=low * Hack to be differently specific when replacing the root= lines. This -- 1.7.9.5