In invirt-autoinstaller:

  * Hack to be differently specific when replacing the root= lines. This
    should replace both the actual grub config lines and the kopt line,
    but leave lines like groot alone.

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

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 d3ba6fd..071f61c 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,7 +85,7 @@ 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 -re "s%^(# *kopt=.*root=)[^ ]*%\1UUID=$ROOT_UUID%" ${prefix}/boot/grub/menu.lst
+sed -i -re "s%^([= ]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
 
 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 d9a3187..f1b5d24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+invirt-autoinstaller (0.0.31) unstable; urgency=low
+
+  * Hack to be differently specific when replacing the root= lines. This
+    should replace both the actual grub config lines and the kopt line,
+    but leave lines like groot alone.
+
+ -- Evan Broder <broder@mit.edu>  Tue, 28 Jul 2009 14:39:25 -0700
+

 invirt-autoinstaller (0.0.30) unstable; urgency=low
 
   * When we're installing the world, be sure to block debconf prompts from
 invirt-autoinstaller (0.0.30) unstable; urgency=low
 
   * When we're installing the world, be sure to block debconf prompts from