diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2016-11-17 13:36:51 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-11-17 18:57:08 +0000 |
| commit | 1fceabaf5f19784001eb8ceecee7effdbd56bedb (patch) | |
| tree | 3c43d3428751abfc6b45c5282032a6faa6723b3c /lt-qcom-debian-images-arm64 | |
| parent | 7ac4c1b8b880d7cc0e396b68b12b4ec1a424f561 (diff) | |
lt-qcom-debian-images-arm64: clean up mounted loop devices on errors
Clean up the mounted loop devices in the cleanup_exit() function.
Always do in the order:
* umount mounted directories
* remove loop device
* remove left over directories
Change-Id: I3753e06ed4c75a20f8ebe09f3bd899cb576f0642
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'lt-qcom-debian-images-arm64')
| -rw-r--r-- | lt-qcom-debian-images-arm64/builders.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lt-qcom-debian-images-arm64/builders.sh b/lt-qcom-debian-images-arm64/builders.sh index 91380b900d..db600b9739 100644 --- a/lt-qcom-debian-images-arm64/builders.sh +++ b/lt-qcom-debian-images-arm64/builders.sh @@ -10,7 +10,9 @@ cleanup_exit() # normal cleanup deferred to later [ $? = 0 ] && exit; cd ${WORKSPACE} + sudo umount rootfs rootfs2 || true sudo kpartx -dv out/${VENDOR}-${OS_FLAVOUR}-*.sd.img || true + sudo rm -rf rootfs rootfs2 || true sudo git clean -fdxq } @@ -163,7 +165,7 @@ EOF linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file ${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img --image-size 3G --binary linaro-${OS_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_${VENDOR}-lt-qcom_*.tar.gz --hwpack-force-yes --bootloader uefi # Create eMMC rootfs image(s) - mkdir rootfs + mkdir -p rootfs rootfs2 for device in $(sudo kpartx -avs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do partition=$(echo ${device} | cut -d'p' -f3) [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs @@ -193,14 +195,13 @@ EOF fi sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz} - mkdir rootfs2 sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2 sudo cp -a rootfs/* rootfs2 rootfs_sz_real=$(sudo du -sh rootfs2 | cut -f1) - sudo umount rootfs2 rootfs + sudo umount rootfs rootfs2 sudo ext2simg -v out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img - sudo kpartx -dv out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img - sudo rm -rf rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img rootfs2 out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw + sudo kpartx -dv out/${VENDOR}-${OS_FLAVOUR}-*.sd.img + sudo rm -f out/${VENDOR}-${OS_FLAVOUR}-*.sd.img out/${VENDOR}-${OS_FLAVOUR}-*.img.raw # Compress image(s) gzip -9 out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img |