In invirt-autoinstaller:

  * Be more specific when replacing root= lines with UUID equivalents in
    the grub menu.lst. This avoids replacing things like groot, which
    makes pygrub unhappy.

svn path=/trunk/packages/invirt-autoinstaller/; revision=2359

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 8447743..d3ba6fd 100755 (executable)
--- a/common/usr/lib/xen-tools/debian.d/93-setup-grub
+++ b/common/usr/lib/xen-tools/debian.d/93-setup-grub
@@ -85,9 +85,9 @@ for i in $(seq 1 "$NUMPARTITIONS"); do
         swap) SWAP_GUEST="$(echo ${!var} | cut -f8 -d:)";;
     esac
 done
         swap) SWAP_GUEST="$(echo ${!var} | cut -f8 -d:)";;
     esac
 done

-sed -i -e "s#root=[^ ]*#root=UUID=$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
+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

 
 #
 # Regenerate automagic kernels list, saving our changes
 
 #
 # Regenerate automagic kernels list, saving our changes

diff --git a/debian/changelog b/debian/changelog
index 175d31b..6c4e299 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+invirt-autoinstaller (0.0.29) unstable; urgency=low
+
+  * Be more specific when replacing root= lines with UUID equivalents in
+    the grub menu.lst. This avoids replacing things like groot, which
+    makes pygrub unhappy.
+
+ -- Evan Broder <broder@mit.edu>  Sat, 13 Jun 2009 19:33:01 -0700
+

 invirt-autoinstaller (0.0.28) unstable; urgency=low
 
   * We're using bashisms in 93-setup-grub, so let's use bash.
 invirt-autoinstaller (0.0.28) unstable; urgency=low
 
   * We're using bashisms in 93-setup-grub, so let's use bash.