diff options
| author |   Tom Rini <trini@konsulko.com> | 2018-04-03 16:11:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-03 16:11:22 -0400 |
| commit | 7fd3464a23a54c495e1a7ab3ef1cde1fe83aeda2 (patch) | |
| tree | 396a901f898e7d364f85784f3f2e4f4d3b3ae771 /scripts | |
| parent | ea00cb6f79616987d7e3c7e83a6ee01cb73eb170 (diff) | |
Make better use of UUIDs on Intel platform wks files
- Stop using --ondisk XXX in the wks files, that enforces using
USB/SATA/etc as /etc/fstab will be referencing these devices.
- Pass --use-uuid for the boot partition
- Update mkefi-agl.sh and mkabl-agl.sh to modify the final fstab to
use the PARTUUID they create rather than the PARTUUID of the resulting
wic file.
Change-Id: I450ba77805fdb83e31411ea48b25aad415fa8a69
Bug-AGL: SPEC-1300
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkabl-agl.sh | 3 | ||||
| -rwxr-xr-x | scripts/mkefi-agl.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mkabl-agl.sh b/scripts/mkabl-agl.sh index 8483d231d..611c08fbc 100755 --- a/scripts/mkabl-agl.sh +++ b/scripts/mkabl-agl.sh @@ -375,6 +375,7 @@ ROOTFS_DISKID=$(fdisk -l "$DEVICE" | grep -e "Disk identifier" | sed -n 's/^.*Di if [ $ROOTFS_DISKID = "" ]; then die "Failed to read DISKID" fi +BOOTFS_PARTUUID="$ROOTFS_DISKID-01" ROOTFS_PARTUUID="$ROOTFS_DISKID-02" debug "PARTUUID for ROOTFS is $ROOTFS_PARTUUID" @@ -476,6 +477,8 @@ fi debug "removing any swap entry in /etc/fstab" sed --in-place '/swap/d' $ROOTFS_MNT/etc/fstab +debug "fixing PARTUUID for /boot" +sed --in-place -e "s#PARTUUID=[0-9a-z-]\+\t/boot#${BOOTFS_PARTUUID}\t/boot#" $ROOTFS_MNT/etc/fstab printf "flushing data on removable device. May take a while ... " sync --file-system $ROOTFS_MNT diff --git a/scripts/mkefi-agl.sh b/scripts/mkefi-agl.sh index 14ade366e..48a0af44d 100755 --- a/scripts/mkefi-agl.sh +++ b/scripts/mkefi-agl.sh @@ -352,6 +352,7 @@ ROOTFS_DISKID=$(fdisk -l "$DEVICE" | grep -e "Disk identifier" | sed -n 's/^.*Di if [ $ROOTFS_DISKID = "" ]; then die "Failed to read DISKID" fi +BOOTFS_PARTUUID="$ROOTFS_DISKID-01" ROOTFS_PARTUUID="$ROOTFS_DISKID-02" debug "PARTUUID for ROOTFS is $ROOTFS_PARTUUID" @@ -500,6 +501,8 @@ else fi debug "removing any swap entry in /etc/fstab" sed --in-place '/swap/d' $ROOTFS_MNT/etc/fstab +debug "fixing PARTUUID for /boot" +sed --in-place -e "s#PARTUUID=[0-9a-z-]\+\t/boot#${BOOTFS_PARTUUID}\t/boot#" $ROOTFS_MNT/etc/fstab printf "flushing data on removable device. May take a while ... " sync --file-system $ROOTFS_MNT |