Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples/guided.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-03-29 16:19:52 +0000
committerGitHub <noreply@github.com>2021-03-29 16:19:52 +0000
commitbb5caf70b7c3daae863778738775823a51b0b92b (patch)
treea2bdefe6205388899336a75392e2969199a25b91 /examples/guided.py
parent4c5be619181b34093e42306c00526fb56e0a328f (diff)
parentb03de49f0f6d29ec8cb7588c2216eb70d523e74d (diff)
Merge pull request #125 from Torxed/torxed-v2.2.3
Fixes encrypted -> non-encrypted setups
Diffstat (limited to 'examples/guided.py')
-rw-r--r--examples/guided.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/guided.py b/examples/guided.py
index 92331450..71e1e01d 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -247,10 +247,10 @@ def perform_installation_steps():
with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
# Wipe the entire drive if the disk flag `keep_partitions`is False.
if archinstall.arguments['harddrive'].keep_partitions is False:
- fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'),
- encrypt_root_partition=archinstall.arguments.get('!encryption-password', False))
- # Otherwise, check if encryption is desired and mark the root partition as encrypted.
- elif archinstall.arguments.get('!encryption-password', None):
+ fs.use_entire_disk(root_filesystem_type=archinstall.arguments.get('filesystem', 'btrfs'))
+
+ # Check if encryption is desired and mark the root partition as encrypted.
+ if archinstall.arguments.get('!encryption-password', None):
root_partition = fs.find_partition('/')
root_partition.encrypted = True