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

Timestamp:

May 3, 2009, 1:41:25 AM (16 years ago)

Author:

broder

Message:

In invirt-autoinstaller:

• Correctly detect what the path to the block devices in fstab are.
• Never prompt when updating the grub config after frobbing it.

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

@@ -79 +79 @@
 ROOT_UUID="$(vol_id --uuid "$ROOT_DEV")"
 SWAP_UUID="$(vol_id --uuid "$SWAP_DEV")"
+for i in $(seq 1 "$NUMPARTITIONS"); do
+    var="PARTITION${i}"
+    case "$(echo ${!var} | cut -f1 -d:)" in
+        disk) ROOT_GUEST="$(echo ${!var} | cut -f8 -d:)";;
+        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_DEV}#${ROOT_UUID}#" ${prefix}/etc/fstab
-sed -i -e "s#${SWAP_DEV}#${SWAP_UUID}#" ${prefix}/etc/fstab
+sed -i -e "s#${ROOT_GUEST}#${ROOT_UUID}#" ${prefix}/etc/fstab
+sed -i -e "s#${SWAP_GUEST}#${SWAP_UUID}#" ${prefix}/etc/fstab
 
 #
-# Regenerate automagic kernels list
+# Regenerate automagic kernels list, saving our changes
 #
-chroot ${prefix} /usr/sbin/update-grub -y
+chroot ${prefix} env UCF_FORCE_CONFFOLD=1 /usr/sbin/update-grub -y
 
 #