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-13 22:19:32 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-13 22:19:32 +0000
commit2abef082a7d037a0e0f6414ca75a9030c43c3e42 (patch)
tree9b1257ae37bc3533cb3b52f6a5ee14c7123e1b16
parent01cb7da8a3377025e7b5479d956a10feb64bc3cb (diff)
Moved the formatting warning inside where we actually format, so we don't scare the users if we're not actually formatting
-rw-r--r--archinstall.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/archinstall.py b/archinstall.py
index 9b54803b..e65a5a02 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -641,13 +641,11 @@ if __name__ == '__main__':
print('[!] Disk PASSWORD is: {}'.format(args['password']))
print()
-
- for i in range(5, 0, -1):
- print(f'Formatting {args["drive"]} in {i}...')
- sleep(1)
-
-
if not args['rerun'] or args['ignore-rerun']:
+ for i in range(5, 0, -1):
+ print(f'Formatting {args["drive"]} in {i}...')
+ sleep(1)
+
o = simple_command('/usr/bin/umount -R /mnt')
o = simple_command('/usr/bin/cryptsetup close /dev/mapper/luksdev')
print('[N] Setting up {drive}.'.format(**args))