From 6cbf8f7f02318e27e5a682776bd15f39852bf9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 19 Jul 2021 22:51:29 +0000
Subject: [PATCH] Update util-mount.sh

---
 lib/util-mount.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/lib/util-mount.sh b/lib/util-mount.sh
index 2173ab2..5dc014d 100644
--- a/lib/util-mount.sh
+++ b/lib/util-mount.sh
@@ -114,8 +114,6 @@ 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
-    info "chroot_mount: active mounts [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
-    info "chroot_mount: active part mounts [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
 }
 
 chroot_mount() {
@@ -145,7 +143,6 @@ 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
-    info "api_efi_mount: active mounts [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
 }
 
 chroot_api_mount() {
@@ -161,29 +158,22 @@ 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
-    info "api_mount: active mounts [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
 }
 
 chroot_part_umount() {
-    info "part_umount: active mounts [%s]" "${CHROOT_ACTIVE_PART_MOUNTS}"
-    mount
-    info "part_umount: [%s]" "${CHROOT_ACTIVE_PART_MOUNTS[@]}"
+    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 "api_umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+    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 "api_efi_umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
+chroot_api_efi_umount() {  
+    info "umount: [%s]" "${CHROOT_ACTIVE_MOUNTS[@]}"
     umount "${CHROOT_ACTIVE_MOUNTS[@]}"
     unset CHROOT_ACTIVE_MOUNTS
 }