From 1ddba87493a1114011d4dcd76b08ee7e0775caea Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Tue, 14 Apr 2020 13:38:10 -0700 Subject: Use stat -L instead of stat, file -L instead of file Use stat -L and file -L so that the two tools follow symlinks correctly. Also fix an error in check_file_type: the error function is called cleanup_and_return_err, not clean_up_and_err_out. Signed-off-by: Stefano Stabellini Reviewed-by: Brian Woods --- scripts/disk_image | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/disk_image') diff --git a/scripts/disk_image b/scripts/disk_image index e085f43..892056d 100755 --- a/scripts/disk_image +++ b/scripts/disk_image @@ -88,22 +88,22 @@ check_depends source "$CFG_FILE" offset=$((2*1024*1024)) -_part1_size=`stat --printf="%s" $UBOOT_OUT/$XEN` -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$DOM0_KERNEL` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$DEVICE_TREE` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$UBOOT_SOURCE` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$UBOOT_SCRIPT` )) +_part1_size=`stat -L --printf="%s" $UBOOT_OUT/$XEN` +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$DOM0_KERNEL` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$DEVICE_TREE` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$UBOOT_SOURCE` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$UBOOT_SCRIPT` )) i=0 while test $i -lt $NUM_DOMUS do - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_KERNEL[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_KERNEL[$i]}` )) if test "${DOMU_RAMDISK[$i]}" then - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_RAMDISK[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_RAMDISK[$i]}` )) fi if test "${DOMU_PASSTHROUGH_DTB[$i]}" then - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_PASSTHROUGH_DTB[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_PASSTHROUGH_DTB[$i]}` )) fi i=$(( $i + 1 )) done @@ -117,7 +117,7 @@ echo PART1 size: "$_part1_size"MB if test "$DOM0_RAMDISK" then - _part2_size=`stat --printf="%s" $UBOOT_OUT/$DOM0_RAMDISK` + _part2_size=`stat -L --printf="%s" $UBOOT_OUT/$DOM0_RAMDISK` fi _part2_size=$(( $_part2_size + $offset - 1)) _part2_size=$(( $_part2_size & ~($offset - 1) )) -- cgit v1.2.3