From 2abef082a7d037a0e0f6414ca75a9030c43c3e42 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 13 Nov 2019 22:19:32 +0000 Subject: Moved the formatting warning inside where we actually format, so we don't scare the users if we're not actually formatting --- archinstall.py | 10 ++++------ 1 file 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)) -- cgit v1.2.3-70-g09d2