JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: many fixes after v29 rebase; mostly involving umount

Browse Source 
- remove grub's --verbose, it's really too verbose
- trust in TMPDIR, do not use trap at all in compile_plymouth-theme-armbian - settings traps adhoc is forbidden in armbian-next as well
- be more verbose in umount_chroot(), do not try to unmount tmpfs-mounted dir itself, only xx/tmp
- try to be smarter about /tmp being mounted in rootfs-to-image -- in the end the recursive saves us
- run post_debootstrap_tweaks when the SDCARD is still mounted, not after
- don't try to download anything from any mirrors if SKIP_ARMBIAN_REPO==yes
This commit is contained in:
Ricardo Pardini
2022-09-25 03:29:51 +02:00
parent 833a7d9ab6
commit d85bf2a155
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/image/rootfs-to-image.sh
View File

@@ -80,9 +80,10 @@ create_image_from_sdcard_rootfs() {
# unmount /boot/efi first, then /boot, rootfs third, image file last
sync
[[ $UEFISIZE != 0 ]] && umount "${MOUNT}${UEFI_MOUNT_POINT}"
[[ $BOOTSIZE != 0 ]] && umount "${MOUNT}/boot"
umount "${MOUNT}"
[[ $UEFISIZE != 0 ]] && run_host_command_logged umount "${MOUNT}${UEFI_MOUNT_POINT}"
[[ $BOOTSIZE != 0 ]] && run_host_command_logged umount "${MOUNT}/boot"
run_host_command_logged umount "${MOUNT}"/tmp || true
run_host_command_logged umount "${MOUNT}" || true
[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose $ROOT_MAPPER
umount_chroot_recursive "${MOUNT}" # @TODO: wait. NFS is not really unmounted above.