Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
af-main: Starting of HTML, API discovery, fix
[AGL/meta-agl.git]
/
scripts
/
mkabl-agl.sh
diff --git
a/scripts/mkabl-agl.sh
b/scripts/mkabl-agl.sh
index
a3d9ae3
..
611c08f
100755
(executable)
--- 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
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"
ROOTFS_PARTUUID="$ROOTFS_DISKID-02"
debug "PARTUUID for ROOTFS is $ROOTFS_PARTUUID"
@@
-451,7
+452,7
@@
if [ -f $HDDIMG_MNT/bzimage ]; then
debug "kernel is bzimage -> vmlinuz"
fi
if [ -f $HDDIMG_MNT/microcode.cpio ]; then
debug "kernel is bzimage -> vmlinuz"
fi
if [ -f $HDDIMG_MNT/microcode.cpio ]; then
-
die "initrd=microcode.cpio is not a supported configuration, change ycoto configuration or use an hddimg as source
"
+
warn "initrd=microcode.cpio is not a supported configuration, microcode.cpio has been ignored
"
fi
[ -z $KERNEL_TYPE ] && die "Linux kernel type in $HDDIMG is unsupported"
fi
[ -z $KERNEL_TYPE ] && die "Linux kernel type in $HDDIMG is unsupported"
@@
-476,6
+477,8
@@
fi
debug "removing any swap entry in /etc/fstab"
sed --in-place '/swap/d' $ROOTFS_MNT/etc/fstab
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
printf "flushing data on removable device. May take a while ... "
sync --file-system $ROOTFS_MNT