Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2019-11-28 00:23:55 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-28 00:23:55 +0000
commit1aec07f82944978ff473336a9919e8b72b1da94d (patch)
treedd1f289ac0b613177d16aa0da0566a6bd7cbc962
parent8cc90ad8741bef833858470d4388544489f98d9e (diff)
Feature: #28 - Fixing the booatloader config when disk ain't encrypted
-rw-r--r--archinstall.py5
1 files changed, 4 insertions, 1 deletions
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