diff options
| author | Brian Woods | 2019-10-23 19:32:16 -0700 |
|---|---|---|
| committer | Stefano Stabellini | 2019-10-24 12:44:01 -0700 |
| commit | aefd022cde5cec7a27bd0786a0a1b5cfa41528d6 (patch) | |
| tree | e821da6976fb240b3e4ef6969c9b8942fb8ff9aa | |
| parent | 814f348e593208bd2c60233bb4d308c57199f416 (diff) | |
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 <brian.woods@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
| -rwxr-xr-x | scripts/disk_image | 9 |
1 files 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 |