From aefd022cde5cec7a27bd0786a0a1b5cfa41528d6 Mon Sep 17 00:00:00 2001 From: Brian Woods Date: Wed, 23 Oct 2019 19:32:16 -0700 Subject: Fix hardcoded dom0 ramdisk name in disk_image Get rid of a hardcoded dom0 ramdisk name so that it doesn't err out when the name is different. Signed-off-by: Brian Woods Reviewed-by: Stefano Stabellini --- scripts/disk_image | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/disk_image b/scripts/disk_image index 57b933f..6a90851 100755 --- a/scripts/disk_image +++ b/scripts/disk_image @@ -13,6 +13,8 @@ IMG="${OUTDIR}/zynqmp.img" . config +UBOOT_OUT_ABS="$(readlink -f $UBOOT_OUT)" + offset=$((2*1024*1024)) _part1_size=`stat --printf="%s" $UBOOT_OUT/$XEN` _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$DOM0_KERNEL` )) @@ -83,7 +85,7 @@ dmsetup create diskimage --table "0 $_disksize linear $_loop_dev 0" # ensure that /dev/mapper/diskimage exists while [ ! -b /dev/mapper/diskimage ] -do +do sleep 2 done @@ -108,12 +110,11 @@ mount -t ext4 /dev/mapper/diskimage2 $DESTDIR/part/disk2 # Extract rootfs cpio archive into `.../part/vos_a` cd ${DESTDIR}/part/disk2 -cat ${UBOOT_OUT}/dom0-ramdisk.cpio | gunzip | cpio -id -mv ${UBOOT_OUT}/dom0-ramdisk.cpio* /tmp +cat "${UBOOT_OUT_ABS}/${DOM0_RAMDISK}" | gunzip | cpio -id +cd - # umount sync -cd / umount $DESTDIR/part/disk2 # create mount point and mount disk1 -- cgit v1.2.3