Index: trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub
===================================================================
--- trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub	(revision 2358)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub	(revision 2359)
@@ -86,7 +86,7 @@
     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
 
 #
Index: trunk/packages/invirt-autoinstaller/debian/changelog
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2358)
+++ trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2359)
@@ -1,2 +1,10 @@
+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