From 0d23345c03282b6317ced7fd0794aa5b5beb5742 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sun, 18 Feb 2024 17:39:31 +0300 Subject: [PATCH] fix automatic encryption --- pikainstall/debian/changelog | 2 +- pikainstall/usr/lib/pika/pikainstall/pikainstall | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog index a3eebab..73b0200 100644 --- a/pikainstall/debian/changelog +++ b/pikainstall/debian/changelog @@ -1,4 +1,4 @@ -pikainstall (1.1.6-100pika4) pikauwu; urgency=medium +pikainstall (1.1.6-100pika5) pikauwu; urgency=medium * Initial release. diff --git a/pikainstall/usr/lib/pika/pikainstall/pikainstall b/pikainstall/usr/lib/pika/pikainstall/pikainstall index f9f9079..ee1e2a5 100755 --- a/pikainstall/usr/lib/pika/pikainstall/pikainstall +++ b/pikainstall/usr/lib/pika/pikainstall/pikainstall @@ -154,9 +154,7 @@ if root_uuid != home_uuid: print("Home Encryption UUID: {}".format(home_uuid_encrypt)) print("Home Encryption Mapped Device Name: {}".format(home_name_encrypt)) if args.cryptkey is not None: - home_passwd = args.cryptkey - elif args.manual is not None: - home_passwd = None + home_passwd = args.cryptkey[0] else: ## Ask user for Home luks partition password for the key-filing process print("\nPlease enter the LUKS password for the device" + home_part_encrypt + " :") @@ -220,7 +218,7 @@ if root_part_encrypt != "luks_none": file.write(albius_crypttab_root_file) # Write crypttab script if system has encryption -if root_uuid != home_uuid and args.manual is None : +if root_uuid != home_uuid and args.manual is None and home_passwd is not None : if home_part_encrypt != "luks_none": subprocess.run(['touch', '/tmp/pika-installer-gtk4-status-crypt.txt']) CRYPTTAB_FILE_PATH = '/var/albius-crypttab.sh'