also umount efivars and minor improvements

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/proxinstall b/proxinstall
index 019ae0b2d6f4dac904cbc0f26d0a662ec7101d18..380abdfec651579f23b90f6b22f563eae215ac44 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -1379,7 +1379,7 @@ sub extract_data {
        syscmd("mount -n -t sysfs sysfs $targetdir/sys") == 0 ||
            die "unable to mount sysfs on $targetdir/sys\n";
        if ($boot_type eq 'efi') {
-           syscmd("mount -n -t efivarfs none $targetdir/sys/firmware/efi/efivars") == 0 ||
+           syscmd("mount -n -t efivarfs efivarfs $targetdir/sys/firmware/efi/efivars") == 0 ||
                die "unable to mount efivarfs on $targetdir/sys/firmware/efi/efivars: $!\n";
        }
        syscmd("chroot $targetdir mount --bind /mnt/hostrun /run") == 0 ||

diff --git a/unconfigured.sh b/unconfigured.sh
index d16ea61f0df4279bba0e50990d009f932ad33717..cf592594f93a63c267efd0b2279a221f9e04fe92 100755 (executable)
--- a/unconfigured.sh
+++ b/unconfigured.sh
@@ -41,6 +41,7 @@ real_reboot() {
     umount -l -n /target >/dev/null 2>&1
     umount -l -n /dev
     umount -l -n /run
+    [ -d /sys/firmware/efi/efivars ] && umount -l -n /sys/firmware/efi/efivars
     umount -l -n /sys
     umount -l -n /proc
 
@@ -65,7 +66,7 @@ mount -n -t proc proc /proc
 mount -n -t sysfs sysfs /sys
 if [ -d /sys/firmware/efi ]; then
     echo "EFI boot mode detected, mounting efivars filesystem"
-    mount -nt efivarfs none /sys/firmware/efi/efivars
+    mount -n -t efivarfs efivarfs /sys/firmware/efi/efivars
 fi
 mount -n -t tmpfs tmpfs /run