From 3ff4b340148538556fa9ff073d2033aa9542a8c9 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 4 Jul 2021 04:55:46 +0200 Subject: export-image: Use ${IMG_SUFFIX} for stage owned sdcard folder: ${DEPLOY_DIR2}/sdcard-${IMG_SUFFIX} --- export-image/04-finalise/01-run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh index 57936df..362d264 100755 --- a/export-image/04-finalise/01-run.sh +++ b/export-image/04-finalise/01-run.sh @@ -97,7 +97,7 @@ rm -rf "${DEPLOY_DIR2}" mkdir -p "${DEPLOY_DIR2}" if [ "${ROOTFS_RO}" = "1" ] ; then - cp -a "${ROOTFS_DIR}/boot" "${DEPLOY_DIR2}/sdcard-${STAGE}" + cp -a "${ROOTFS_DIR}/boot" "${DEPLOY_DIR2}/sdcard-${IMG_SUFFIX}" fi unload_qimage @@ -111,7 +111,7 @@ if [ "${ROOTFS_RO}" = "1" ] ; then mksquashfs "${ROOTFS_DIR}" "${IMG_FILE_ROOT_SQFS_LZO}" -comp lzo mksquashfs "${ROOTFS_DIR}" "${IMG_FILE_ROOT_SQFS_NONE}" -noI -noD -noF -noX umount "${ROOTFS_DIR}" - cp -a "$INFO_FILE_ROOT" "${DEPLOY_DIR2}/sdcard-${STAGE}/sys_arm64_000/rootfs.inf" + cp -a "$INFO_FILE_ROOT" "${DEPLOY_DIR2}/sdcard-${IMG_SUFFIX}/sys_arm64_000/rootfs.inf" fi mv "$INFO_FILE" "$INFO_FILE_ROOT" "$DEPLOY_DIR2/" @@ -127,8 +127,8 @@ fi mv "$IMG_FILE" "$DEPLOY_DIR2/" if [ "${ROOTFS_RO}" = "1" ] ; then - # cp -a "$IMG_FILE_ROOT_EXT4" "${DEPLOY_DIR2}/sdcard-${STAGE}/sys_arm64_000/rootfs.img" - cp -a "$IMG_FILE_ROOT_SQFS_LZO" "${DEPLOY_DIR2}/sdcard-${STAGE}/sys_arm64_000/rootfs.img" + # cp -a "$IMG_FILE_ROOT_EXT4" "${DEPLOY_DIR2}/sdcard-${IMG_SUFFIX}/sys_arm64_000/rootfs.img" + cp -a "$IMG_FILE_ROOT_SQFS_LZO" "${DEPLOY_DIR2}/sdcard-${IMG_SUFFIX}/sys_arm64_000/rootfs.img" mv "$IMG_FILE_ROOT_EXT4" "$DEPLOY_DIR2/" mv "$IMG_FILE_ROOT_SQFS_GZ" "$DEPLOY_DIR2/" -- cgit v1.2.3