index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton.feeds+github@gmail.com> | 2019-11-28 00:23:55 +0000 |
---|---|---|
committer | Anton Hvornum <anton.feeds+github@gmail.com> | 2019-11-28 00:23:55 +0000 |
commit | 1aec07f82944978ff473336a9919e8b72b1da94d (patch) | |
tree | dd1f289ac0b613177d16aa0da0566a6bd7cbc962 | |
parent | 8cc90ad8741bef833858470d4388544489f98d9e (diff) |
-rw-r--r-- | archinstall.py | 5 |
diff --git a/archinstall.py b/archinstall.py index 899566c8..1cc42255 100644 --- a/archinstall.py +++ b/archinstall.py @@ -1017,7 +1017,10 @@ def setup_bootloader(*positionals, **kwargs): entry.write('title Arch Linux\n') entry.write('linux /vmlinuz-linux\n') entry.write('initrd /initramfs-linux.img\n') - entry.write('options cryptdevice=UUID={UUID}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n'.format(UUID=UUID)) + if args['skip-encrypt']: + entry.write('options root=PARTUUID={UUID} rw intel_pstate=no_hwp\n'.format(UUID=UUID)) + else: + entry.write('options cryptdevice=UUID={UUID}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n'.format(UUID=UUID)) return True |