X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fmkefi-agl.sh;h=e3240a6e5ee4e8499bd75fb21222c44fd7277e89;hb=265ef30adadc52204efbd8b61ec950c507b512ab;hp=d1cf6f49058aeb24dde4af46838f6b514df324f5;hpb=81131e2b73f19a58a9be2eb8daad24cdd4314be0;p=AGL%2Fmeta-agl.git diff --git a/scripts/mkefi-agl.sh b/scripts/mkefi-agl.sh index d1cf6f490..e3240a6e5 100755 --- a/scripts/mkefi-agl.sh +++ b/scripts/mkefi-agl.sh @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# Modification from mkefidisk.sh provided by the Yocto project by Dominig +# Modification from mkefidisk.sh provided by the Yocto project by Dominig # to install Automotive Grade Linux (AGL) on Minnowboard and any PC with UEFI boot # # changes @@ -26,19 +26,23 @@ # - create a grub config with PARTUID to ease boot from various devices automaticaly # - add a UEFI startup.nsh script for autoboot # - does not allocate swap -# +# - accept .hddimg, wic and wic.xz as sources LANG=C # Set to 1 to enable additional output DEBUG=0 -OUT="/dev/null" +exec 3>/dev/null # # Defaults # -# 20 Mb for the boot partition -BOOT_SIZE=20 +# 100 Mb for the boot partition +BOOT_SIZE=100 +# min available space on TMP_DIR for uncompressing xz image in kB e.g. 5G (5000000) +TMP_SIZE_MIN=5000000 +# TMP_DIR directory use for holding image file for uncompression (e.g. /tmp or $HOME) +TMP_DIR=/tmp # Cleanup after die() cleanup() { @@ -47,13 +51,20 @@ cleanup() { unmount $ROOTFS_MNT || error "Failed to unmount $ROOTFS_MNT" unmount $BOOTFS_MNT || error "Failed to unmount $BOOTFS_MNT" unmount $HDDIMG_ROOTFS_MNT || error "Failed to unmount $HDDIMG_ROOTFS_MNT" - unmount $HDDIMG_MNT || error "Failed to unmount $HDDIMG_MNT" + unmount $HDDIMG_MNT || error "Failed to unmount $HDDIMG_MNT" + if [ "$IMG_TYPE" = "DISK" ]; then + debug "de-attaching loop devices" + for LOOP_DEVICE in `losetup --list |grep $HDDIMG | cut -d" " -f1` ; do + losetup -d $LOOP_DEVICE 1>&3 2>&1 || error "Detaching $LOOP_DEVICE from $HDDIMG failled" + done + fi # Remove the TMPDIR debug "Removing temporary files" if [ -d "$TMPDIR" ]; then - rm -rf $TMPDIR || error "Failed to remove $TMPDIR" + rm -rf "$TMPDIR" || error "Failed to remove $TMPDIR" fi + [ -f "$TMP_DIR/TMP-AGL-wic-image.wic" ] || rm -f $TMP_DIR/TMP-AGL-wic-image.wic } trap 'die "Signal Received, Aborting..."' HUP INT TERM @@ -95,12 +106,14 @@ usage() { echo "Install AGL on a removable device to boot on IA UEFI based computer" echo "In particular is can create USB or SD bootable support for Minnowboard" echo "" - echo "Usage: $(basename $0) [-v] HDDIMG REMOVABLE_DEVICE" + echo "Usage: $(basename $0) [-v] IDSK_IMAGE REMOVABLE_DEVICE" echo " -v: Verbose debug" - echo " HDDIMG: The hddimg file to generate the efi disk from" + echo " HDDIMG: The DISK_IMAGE file generated by Yocto the efi disk from" + echo " Supported formats are .hddimg, .wic .wic.xz" echo " REMOVABLE_DEVICE: The block device to write the image to, e.g. /dev/sdh" echo "ex:" echo " mkefi-agl.sh agl-demo-platform-intel-corei7-64.hddimg /dev/sdd" + echo " mkefi-agl.sh agl-demo-platform-intel-corei7-64.wic.xz /dev/sdd" exit 1 } @@ -143,6 +156,7 @@ unmount_device() { if [ $? -eq 0 ]; then warn "$DEVICE listed in /proc/mounts, attempting to unmount" umount $DEVICE* 2>/dev/null + ! grep -q $DEVICE /proc/mounts && info "Unmounted successfully" return $? fi return 0 @@ -156,6 +170,7 @@ unmount() { if [ $? -eq 0 ]; then debug "Unmounting $1" umount $1 + ! grep -q $1 /proc/mounts # check if unmounted successfully return $? fi return 0 @@ -167,13 +182,13 @@ unmount() { if [ "$1" != "-v" ] && [ $# -ne 2 ]; then usage fi -if [ "$1" == "-v" ] && [ $# -ne 3 ]; then +if [ "$1" = "-v" ] && [ $# -ne 3 ]; then usage fi if [ "$1" = "-v" ] ; then DEBUG=1 - OUT="1" + exec 3>&1 shift fi @@ -196,11 +211,55 @@ fi if [ ! -e "$HDDIMG" ]; then die "HDDIMG $HDDIMG does not exist" fi +HDDIMG_EXT=${HDDIMG##*.} +case $HDDIMG_EXT in + hddimg) + IMG_TYPE="MOUNT" + IMG_COMPRESS="NO" + debug "Detected: uncompressed image type .hddimg" + ;; + wic) + IMG_TYPE="DISK" + IMG_COMPRESS="NO" + debug "Detected: uncompressed image type .wic" + ;; + xz) + IMG_TYPE="DISK" + IMG_COMPRESS="YES" + debug "Detected: xz compressed image type .wic" + command -v xz >/dev/null 2>&1 || { die "xz command is not available, pleaes install xz package"; } + TMP_SIZE=`df -k $TMP_DIR | awk '/[0-9]%/{print $(NF-2)}'` + if [ "$TMP_SIZE" -lt "$TMP_SIZE_MIN" ]; then + die "Available space on $TMP_DIR must be at least $TMP_SIZE_MIN kB" + fi + printf "Starting decompression of the image. It may take some time ..." + xz --decompress --keep --format=auto --force --threads=0 --stdout > $TMP_DIR/TMP-AGL-wic-image.wic $HDDIMG|| \ + die "xz command failled: xz --decompress --keep --format=auto --force --threads=0 --stdout > $TMP_DIR/TMP-AGL-wic-image.wic" + HDDIMG="$TMP_DIR/TMP-AGL-wic-image.wic" + echo "Image uncompressed, starting doing real work ..." + ;; + *) + die "Unsupported image format: $HDDIMG_EXT Supported format are .hddimg .wic wic.xz" + ;; +esac # # Ensure the hddimg is not mounted # -unmount "$HDDIMG" || die "Failed to unmount $HDDIMG" +debug "will now try to umount /detach previous images" +case $IMG_TYPE in + MOUNT) + unmount "$HDDIMG" || die "Failed to unmount $HDDIMG" + ;; + DISK) + [ `losetup --list |grep $HDDIMG | wc -l ` -gt 1 ] && die "Image mounted more than once, manual cleaning required see: losetup --list" + debug "ready to attach the wic image to aloop device" + LOOP_DEVICE=`losetup --find --show $HDDIMG` && ( losetup -d $LOOP_DEVICE 1>&3 2>&1 || die "Detaching $LOOP_DEVICE from $HDDIMG failled") + ;; + *) + die "unknown image format $IMG_TYPE" + ;; +esac # # Check if any $DEVICE partitions are mounted @@ -215,8 +274,7 @@ device_details $(basename $DEVICE) echo -n "${INFO}Prepare EFI image on $DEVICE [y/N]?${CLEAR} " read RESPONSE if [ "$RESPONSE" != "y" ]; then - echo "Image creation aborted" - exit 0 + die "Image creation aborted" fi @@ -273,29 +331,29 @@ echo "" info "Partitioning installation media ($DEVICE)" debug "Deleting partition table on $DEVICE" -dd if=/dev/zero of=$DEVICE bs=512 count=2 >$OUT 2>&1 || die "Failed to zero beginning of $DEVICE" +dd if=/dev/zero of=$DEVICE bs=512 count=2 1>&3 2>&1 || die "Failed to zero beginning of $DEVICE" debug "Creating new partition table (MSDOS) on $DEVICE" -parted -s $DEVICE mklabel msdos >$OUT 2>&1 || die "Failed to create MSDOS partition table" +parted -s $DEVICE mklabel msdos 1>&3 2>&1 || die "Failed to create MSDOS partition table" debug "Creating boot partition on $BOOTFS" -parted -s $DEVICE mkpart primary 0% $BOOT_SIZE >$OUT 2>&1 || die "Failed to create BOOT partition" +parted -s $DEVICE mkpart primary 0% $BOOT_SIZE 1>&3 2>&1 || die "Failed to create BOOT partition" debug "Enabling boot flag on $BOOTFS" -parted -s $DEVICE set 1 boot on >$OUT 2>&1 || die "Failed to enable boot flag" +parted -s $DEVICE set 1 boot on 1>&3 2>&1 || die "Failed to enable boot flag" debug "Creating ROOTFS partition on $ROOTFS" -parted -s $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END >$OUT 2>&1 || die "Failed to create ROOTFS partition" +parted -s $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END 1>&3 2>&1 || die "Failed to create ROOTFS partition" # as blkid does not provide PARTUUID on Ubuntu LTS 14.04 we myst hack via fdisk #ROOTFS_PARTUUID=$(blkid |grep -e "$ROOTFS" |sed -n 's/^.*PARTUUID=/PARTUUID=/p') export LC_ALL=C ROOTFS_DISKID=$(fdisk -l "$DEVICE" | grep -e "Disk identifier" | sed -n 's/^.*Disk identifier: 0x/PARTUUID=/p') -if [ $ROOTFS_DISKID == "" ]; then +if [ $ROOTFS_DISKID = "" ]; then die "Failed to read DISKID" fi ROOTFS_PARTUUID="$ROOTFS_DISKID-02" -debug "PARTUUID for ROOTFS in grub.conf is $ROOTFS_PARTUUID" +debug "PARTUUID for ROOTFS is $ROOTFS_PARTUUID" if [ $DEBUG -eq 1 ]; then parted -s $DEVICE print @@ -314,35 +372,67 @@ unmount_device || die "Failed to unmount $DEVICE partitions" info "Formatting partitions" debug "Formatting $BOOTFS as vfat" if [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then - mkfs.vfat -I $BOOTFS -n "EFI" >$OUT 2>&1 || die "Failed to format $BOOTFS" + mkfs.vfat -I $BOOTFS -n "EFI" 1>&3 2>&1 || die "Failed to format $BOOTFS" else - mkfs.vfat $BOOTFS -n "EFI" >$OUT 2>&1 || die "Failed to format $BOOTFS" + mkfs.vfat $BOOTFS -n "EFI" 1>&3 2>&1 || die "Failed to format $BOOTFS" fi -debug "Formatting $ROOTFS as ext3" -mkfs.ext3 -F $ROOTFS -L "ROOT" >$OUT 2>&1 || die "Failed to format $ROOTFS" +debug "Formatting $ROOTFS as ext4" +mkfs.ext4 -F $ROOTFS -L "ROOT" 1>&3 2>&1 || die "Failed to format $ROOTFS" # -# Installing to $DEVICE +# Mounting image file system on loop devices # -debug "Mounting images and device in preparation for installation" -mount -o loop $HDDIMG $HDDIMG_MNT >$OUT 2>&1 || error "Failed to mount $HDDIMG" -mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT >$OUT 2>&1 || error "Failed to mount rootfs.img" -mount $ROOTFS $ROOTFS_MNT >$OUT 2>&1 || error "Failed to mount $ROOTFS on $ROOTFS_MNT" -mount $BOOTFS $BOOTFS_MNT >$OUT 2>&1 || error "Failed to mount $BOOTFS on $BOOTFS_MNT" +case $IMG_TYPE in + + MOUNT) + debug "Mounting images and device in preparation for installation" + mount -o loop $HDDIMG $HDDIMG_MNT 1>&3 2>&1 || die "Failed to mount $HDDIMG" + mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT 1>&3 2>&1 || die "Failed to mount rootfs.img" + ;; + DISK) + debug "Attaching image and mounting partitions then device in preparation for installation" + LOOP_DEVICE=`losetup --find` || die "Failled to find an available loop device see: losetup --find" + losetup -P $LOOP_DEVICE $HDDIMG 1>&3 2>&1 || die "Attaching $LOOP_DEVICE from $HDDIMG failled" + mount "$LOOP_DEVICE"p2 $HDDIMG_ROOTFS_MNT 1>&3 2>&1 || die "Failed to mount $LOOP_DEVICEp1 on $HDDIMG_ROOTFS_MNT" + mount "$LOOP_DEVICE"p1 $HDDIMG_MNT 1>&3 2>&1 || die "Failed to mount $LOOP_DEVICEp2 on $HDDIMG_MNT" + ;; + *) + die "unknown image format $IMG_TYPE" + ;; +esac +# Mount removable device + mount $ROOTFS $ROOTFS_MNT 1>&3 2>&1 || die "Failed to mount $ROOTFS on $ROOTFS_MNT" + mount $BOOTFS $BOOTFS_MNT 1>&3 2>&1 || die "Failed to mount $BOOTFS on $BOOTFS_MNT" + info "Preparing boot partition" EFIDIR="$BOOTFS_MNT/EFI/BOOT" -cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy vmlinuz" -if [ -f $HDDIMG_MNT/initrd ]; then - cp $HDDIMG_MNT/initrd $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy initrd" +if [ -f $HDDIMG_MNT/vmlinuz ]; then + cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy vmlinuz" + KERNEL_TYPE="VMLINUZ" + debug "kernel is vmlinuz" +fi +if [ -f $HDDIMG_MNT/bzimage ]; then + cp $HDDIMG_MNT/bzimage $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy vmlinuz" + KERNEL_TYPE="BZIMAGE" + debug "kernel is bzimage" +fi +[ -z $KERNEL_TYPE ] && die "Linux kernel type in $HDDIMG is unsupported" + +if [ -f $HDDIMG_MNT/initrd ] + then + echo "initrd detected" + cp $HDDIMG_MNT/initrd $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy initrd" + else + warn "initrd missing" fi -echo "bootx64.efi" > $BOOTFS_MNT/startup.nsh || error "Failed to create startup.nsh" +echo "bootx64.efi" > $BOOTFS_MNT/startup.nsh || die "Failed to create startup.nsh" # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) -cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy EFI dir" -# Silently ignore a missing gummiboot loader dir (we might just be a GRUB image) -cp -r $HDDIMG_MNT/loader $BOOTFS_MNT >$OUT 2>&1 +cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT 1>&3 2>&1 || die "Failed to copy EFI dir" +# Silently ignore a missing systemd-boot or gummiboot loader dir (we might just be a GRUB image) +cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 1>&3 2>&1 # Update the boot loaders configurations for an installed image # Remove any existing root= kernel parameters and: @@ -362,17 +452,46 @@ if [ -e "$GRUB_CFG" ]; then sed -i "s/ LABEL=[^ ]*/ /" $GRUB_CFG sed -i "s@ root=[^ ]*@ @" $GRUB_CFG - sed -i "s@vmlinuz @vmlinuz root=$ROOTFS_PARTUUID ro rootwait quiet @" $GRUB_CFG + sed -i "s@vmlinuz @vmlinuz root=$ROOTFS_PARTUUID @" $GRUB_CFG +fi + +# look for a systemd-boot loader.conf file and create a default boot entry +SYSTEMDBOOT_CFG="$BOOTFS_MNT/loader/loader.conf" +if [ -e "$SYSTEMDBOOT_CFG" ]; then + info "Configuring SYSTEMD-BOOT" + SYSTEMDBOOT_BOOT="$BOOTFS_MNT/loader/entries/boot.conf" + SYSTEMDBOOT_DEBUG="$BOOTFS_MNT/loader/entries/debug.conf" + # Delete the install entry + sed -i "/menuentry 'install'/,/^}/d" $SYSTEMDBOOT_CFG + rm -rf "$BOOTFS_MNT/loader/entries/install.conf" 1>&3 2>&1 + # Add PARTUUID to the boot entry file + if [ ! -e "$SYSTEMDBOOT_BOOT" ]; then + die "no boot.conf entry found in systemd-boot directories" + fi + # Delete any LABEL= strings + sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_BOOT + + sed -i "s@ root=[^ ]*@ @" $SYSTEMDBOOT_BOOT + sed -i "s@options @options root=$ROOTFS_PARTUUID @" $SYSTEMDBOOT_BOOT fi # Ensure we have at least one EFI bootloader configured -if [ ! -e $GRUB_CFG ] ; then +if [ ! -e $GRUB_CFG ] && [ ! -e $SYSTEMDBOOT_CFG ] ; then die "No EFI bootloader configuration found" fi -info "Copying ROOTFS files (this may take a while)" -cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT >$OUT 2>&1 || die "Root FS copy failed" +printf "Copying ROOTFS files ... " +command -v rsync >/dev/null 2>&1 # check if rsync exists +if [ $DEBUG -eq 1 ] && [ $? -eq 0 ]; then + rsync --info=progress2 -h -aHAXW --no-compress $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT 1>&3 2>&1 || die "Root FS copy failed" +else + cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT 1>&3 2>&1 || die "Root FS copy failed" +fi + +printf "flushing data on removable device. May take a while ... " +sync --file-system $ROOTFS_MNT +echo done # We dont want udev to mount our root device while we're booting... if [ -d $ROOTFS_MNT/etc/udev/ ] ; then