|
@@ -306,15 +306,15 @@ fi
|
|
|
|
|
|
unmount(){
|
|
|
# Unmount if mounted
|
|
|
-! mountpoint -q $mnt/proc || umount $mnt/proc
|
|
|
-! mountpoint -q $mnt/sys || umount $mnt/sys
|
|
|
-! mountpoint -q $mnt/dev/pts || umount $mnt/dev/pts
|
|
|
-! mountpoint -q $mnt/dev || umount $mnt/dev
|
|
|
-! mountpoint -q $mnt/root || umount $mnt/root
|
|
|
-! mountpoint -q $disk0 || umount $disk0
|
|
|
-! mountpoint -q $disk1 || umount $disk1
|
|
|
+! mountpoint -q $mnt/proc || umount $mnt/proc
|
|
|
+! mountpoint -q $mnt/sys || umount $mnt/sys
|
|
|
+! mountpoint -q $mnt/dev/pts || umount $mnt/dev/pts
|
|
|
+! mountpoint -q $mnt/dev || umount $mnt/dev
|
|
|
+! mountpoint -q $mnt/boot/efi || umount $mnt/boot/efi
|
|
|
+! mountpoint -q $mnt || umount $mnt
|
|
|
# Delete mount-point if empty and not mounted
|
|
|
-[ -z "$(ls -A /mnt/)" ] && ! mountpoint -q $mnt && rm -R $mnt
|
|
|
+[ -z "$(ls -A $mnt)" ] && ! mountpoint -q $mnt && rm -R $mnt
|
|
|
+[ -z "$(ls -A $mnt/boot/efi)" ] && ! mountpoint -q $mnt/boot/efi && rm -R $mnt/boot/efi
|
|
|
}
|
|
|
|
|
|
|