Changeset 2341 for trunk


Ignore:
Timestamp:
May 3, 2009, 1:41:25 AM (15 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.
Location:
trunk/packages/invirt-autoinstaller
Files:
2 edited

Legend:

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

    r2339 r2341  
    7979ROOT_UUID="$(vol_id --uuid "$ROOT_DEV")"
    8080SWAP_UUID="$(vol_id --uuid "$SWAP_DEV")"
     81for i in $(seq 1 "$NUMPARTITIONS"); do
     82    var="PARTITION${i}"
     83    case "$(echo ${!var} | cut -f1 -d:)" in
     84        disk) ROOT_GUEST="$(echo ${!var} | cut -f8 -d:)";;
     85        swap) SWAP_GUEST="$(echo ${!var} | cut -f8 -d:)";;
     86    esac
     87done
    8188sed -i -e "s#root=[^ ]*#root=UUID=$ROOT_UUID#" ${prefix}/boot/grub/menu.lst
    82 sed -i -e "s#${ROOT_DEV}#${ROOT_UUID}#" ${prefix}/etc/fstab
    83 sed -i -e "s#${SWAP_DEV}#${SWAP_UUID}#" ${prefix}/etc/fstab
     89sed -i -e "s#${ROOT_GUEST}#${ROOT_UUID}#" ${prefix}/etc/fstab
     90sed -i -e "s#${SWAP_GUEST}#${SWAP_UUID}#" ${prefix}/etc/fstab
    8491
    8592#
    86 # Regenerate automagic kernels list
     93# Regenerate automagic kernels list, saving our changes
    8794#
    88 chroot ${prefix} /usr/sbin/update-grub -y
     95chroot ${prefix} env UCF_FORCE_CONFFOLD=1 /usr/sbin/update-grub -y
    8996
    9097#
  • trunk/packages/invirt-autoinstaller/debian/changelog

    r2339 r2341  
     1invirt-autoinstaller (0.0.27) unstable; urgency=low
     2
     3  * Correctly detect what the path to the block devices in fstab are.
     4  * Never prompt when updating the grub config after frobbing it.
     5
     6 -- Evan Broder <broder@mit.edu>  Sun, 03 May 2009 01:40:55 -0400
     7
    18invirt-autoinstaller (0.0.26) unstable; urgency=low
    29
Note: See TracChangeset for help on using the changeset viewer.