Changeset 2339 for trunk/packages/invirt-autoinstaller/common

Timestamp:

May 3, 2009, 1:19:10 AM (16 years ago)

Author:

broder

Message:

In invirt-autoinstaller:

• Switch the grub config and /etc/fstab to using UUIDs for specifying the boot and swap partitions.

File:

• trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub (modified) (1 diff)

trunk/packages/invirt-autoinstaller/common/usr/lib/xen-tools/debian.d/93-setup-grub

@@ -69 +69 @@
 
 #
+# 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
 #