From 72d0f685bbe08241fa0c911bffeba295380d2dc7 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 17 Feb 2024 21:16:44 +0300 Subject: [PATCH] fix some issues --- pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh | 1 + pikainstall/usr/lib/pika/pikainstall/pikainstall | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh index 778d4bf..d4dfbc4 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh +++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh @@ -3,6 +3,7 @@ # Clear fstab touch /etc/fstab # Generate fstab entries +dpkg -s arch-install-scripts || apt install -y arch-install-scripts cryptsetup genfstab -U / | grep -v zram | grep -v portal | grep -v loop | grep -v cdrom > /etc/fstab # Remove packages that are only needed for the live session apt remove casper -y diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall index 9b5ecc3..f9f9079 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pikainstall +++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall @@ -239,7 +239,7 @@ if root_uuid != home_uuid and args.manual is None : if args.manual is not None and args.manual[0] == "2": subprocess.run(['touch', '/tmp/pika-installer-gtk4-status-crypt.txt']) CRYPTTAB_MANUAL_FILE_PATH = '/var/albius-crypttab-manual.sh' - CHROOT_CRYPTTAB_MANUAL_FILE_PATH = CHROOT_PATH+CRYPTTAB_MANUAL_FILE_PATH + CHROOT_CRYPTTAB_MANUAL_FILE_PATH = CRYPTTAB_MANUAL_FILE_PATH silentremove(CHROOT_CRYPTTAB_MANUAL_FILE_PATH) print("writing to:") print(CHROOT_CRYPTTAB_MANUAL_FILE_PATH)