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 2337)
+++ trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub	(revision 2339)
@@ -69,4 +69,19 @@
 
 #
+# Since pv_ops kernels force block device names to xvda, xvdb, etc,
+# the default root value of root=/dev/hda won't actually help us.
+#
+# To work around that, find a UUID for the swap and root partitions
+# and use that in the grub config (and also in /etc/fstab)
+#
+ROOT_DEV="$(perl -e 'print $ENV{"image-dev"}')"
+SWAP_DEV="$(perl -e 'print $ENV{"swap-dev"}')"
+ROOT_UUID="$(vol_id --uuid "$ROOT_DEV")"
+SWAP_UUID="$(vol_id --uuid "$SWAP_DEV")"
+sed -i -e "s#root=[^ ]*#root=UUID=$ROOT_UUID#" ${prefix}/boot/grub/menu.lst
+sed -i -e "s#${ROOT_DEV}#${ROOT_UUID}#" ${prefix}/etc/fstab
+sed -i -e "s#${SWAP_DEV}#${SWAP_UUID}#" ${prefix}/etc/fstab
+
+#
 # Regenerate automagic kernels list
 #
Index: trunk/packages/invirt-autoinstaller/debian/changelog
===================================================================
--- trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2337)
+++ trunk/packages/invirt-autoinstaller/debian/changelog	(revision 2339)
@@ -1,2 +1,9 @@
+invirt-autoinstaller (0.0.26) unstable; urgency=low
+
+  * Switch the grub config and /etc/fstab to using UUIDs for specifying
+    the boot and swap partitions.
+
+ -- Evan Broder <broder@mit.edu>  Sun, 03 May 2009 01:18:45 -0400
+
 invirt-autoinstaller (0.0.25) unstable; urgency=low