From 55603df91658ac18661dd0353b103a79e4f6170d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 19 Jul 2021 19:06:23 +0000 Subject: [PATCH] Update util-mount.sh - more debug --- lib/util-mount.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/util-mount.sh b/lib/util-mount.sh index c7d1f68..db3f106 100644 --- a/lib/util-mount.sh +++ b/lib/util-mount.sh @@ -114,6 +114,7 @@ chroot_mount_partitions(){ chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 && chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid chroot_mount /etc/resolv.conf "$1/etc/resolv.conf" --bind + mount } chroot_mount() { @@ -143,6 +144,7 @@ chroot_api_efi_mount() { chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev && chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 && chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid + mount } chroot_api_mount() { @@ -158,21 +160,28 @@ chroot_api_mount() { chroot_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev && chroot_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 && chroot_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid + mount } chroot_part_umount() { + info "part_umount: active mounts [%s]" "${CHROOT_ACTIVE_PART_MOUNTS}" + mount info "umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}" umount "${CHROOT_ACTIVE_PART_MOUNTS[@]}" unset CHROOT_ACTIVE_PART_MOUNTS } chroot_api_umount() { + info "api_umount: active mounts [%s]" "${CHROOT_ACTIVE_MOUNTS}" + mount info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}" umount "${CHROOT_ACTIVE_MOUNTS[@]}" unset CHROOT_ACTIVE_MOUNTS } chroot_api_efi_umount() { + info "api_efi_umount: active mounts [%s]" "${CHROOT_ACTIVE_MOUNTS}" + mount info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}" umount "${CHROOT_ACTIVE_MOUNTS[@]}" unset CHROOT_ACTIVE_MOUNTS