From dea730ea4ce9088bf07a101b16d5fd3b91c25a6a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 8 Jul 2019 18:03:25 +0200 Subject: [PATCH] also umount efivars and minor improvements Signed-off-by: Thomas Lamprecht --- proxinstall | 2 +- unconfigured.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/proxinstall b/proxinstall index 019ae0b..380abdf 100755 --- 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 d16ea61..cf59259 100755 --- 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 -- 2.39.2