general-packages/pikainstall
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix automatic encryption

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-02-18 17:39:31 +03:00
parent d3d20cac40
commit 0d23345c03
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pikainstall/debian/changelog
View File

@ -1,4 +1,4 @@
pikainstall (1.1.6-100pika4) pikauwu; urgency=medium pikainstall (1.1.6-100pika5) pikauwu; urgency=medium
* Initial release. * Initial release.

6
pikainstall/usr/lib/pika/pikainstall/pikainstall
View File

@ -154,9 +154,7 @@ if root_uuid != home_uuid:
print("Home Encryption UUID: {}".format(home_uuid_encrypt)) print("Home Encryption UUID: {}".format(home_uuid_encrypt))
print("Home Encryption Mapped Device Name: {}".format(home_name_encrypt)) print("Home Encryption Mapped Device Name: {}".format(home_name_encrypt))
if args.cryptkey is not None: if args.cryptkey is not None:
home_passwd = args.cryptkey home_passwd = args.cryptkey[0]
elif args.manual is not None:
home_passwd = None
else: else:
## Ask user for Home luks partition password for the key-filing process ## Ask user for Home luks partition password for the key-filing process
print("\nPlease enter the LUKS password for the device" + home_part_encrypt + " :") 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) file.write(albius_crypttab_root_file)
# Write crypttab script if system has encryption # 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": if home_part_encrypt != "luks_none":
subprocess.run(['touch', '/tmp/pika-installer-gtk4-status-crypt.txt']) subprocess.run(['touch', '/tmp/pika-installer-gtk4-status-crypt.txt'])
CRYPTTAB_FILE_PATH = '/var/albius-crypttab.sh' CRYPTTAB_FILE_PATH = '/var/albius-crypttab.sh'