diff options
| author | Ayan Kumar Halder | 2022-01-10 19:39:34 +0000 |
|---|---|---|
| committer | Stefano Stabellini | 2022-01-10 12:36:33 -0800 |
| commit | 8f01717f27341e554fa39ed6f026a0d333fb4790 (patch) | |
| tree | 113e4f3023932d5616f76fb34a32d6ac573588dd /scripts | |
| parent | 1993749a7d38b825e9ec74b0da20041cd7e41c67 (diff) | |
Check for the presence of DOMU_PASSTHROUGH_DTB before invoking update_domU_cfg
It should be possible to run disk_image when the user has specified
neither DOMU_PASSTHROUGH_PATHS nor DOMU_PASSTHROUGH_DTB. In such a
scenario, the script should not update the relevant portions of domU.cfg.
Signed-off-by: Ayan Kumar Halder <ayankuma@xilinx.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/disk_image | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/disk_image b/scripts/disk_image index afd21f9..1efc3af 100755 --- a/scripts/disk_image +++ b/scripts/disk_image @@ -392,13 +392,10 @@ function generate_domU_configs() fi dest="$DESTDIR/part/disk$j/etc/xen/domU$i.cfg" - cp ${DOMU_PASSTHROUGH_DTB[$i]} $DESTDIR/part/disk$j/etc/xen/ echo "name=\"domU$i\"" >> $dest echo "memory=${DOMU_MEM[$i]}" >> $dest echo "vcpus=${DOMU_VCPUS[$i]}" >> $dest - dtb_name="$(basename ${DOMU_PASSTHROUGH_DTB[$i]})" - echo "device_tree=\"/etc/xen/$dtb_name\"" >> $dest echo "# mount $first_part /boot" >> $dest echo "kernel=\"/boot/${DOMU_KERNEL[$i]}\"" >> $dest if test "${DOMU_RAMDISK[$i]}" @@ -426,12 +423,18 @@ function generate_domU_configs() echo "disk=[\"$retval,,xvda\"]" >> $dest fi - update_domU_cfg ${DOMU_PASSTHROUGH_DTB[$i]} $dest - if test $? -ne 0 + if test "${DOMU_PASSTHROUGH_DTB[$i]}" then - umount $DESTDIR/part/disk$j - cleanup_disk_image_error - exit 1 + cp ${DOMU_PASSTHROUGH_DTB[$i]} $DESTDIR/part/disk$j/etc/xen/ + dtb_name="$(basename ${DOMU_PASSTHROUGH_DTB[$i]})" + echo "device_tree=\"/etc/xen/$dtb_name\"" >> $dest + update_domU_cfg ${DOMU_PASSTHROUGH_DTB[$i]} $dest + if test $? -ne 0 + then + umount $DESTDIR/part/disk$j + cleanup_disk_image_error + exit 1 + fi fi fi |