From 1c7077029b2cdce1d0e331c0d464a32ceb15533b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 19 Nov 2019 00:46:27 +0000 Subject: debugging --- archinstall.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/archinstall.py b/archinstall.py index fa184dd4..68d59ecb 100644 --- a/archinstall.py +++ b/archinstall.py @@ -873,11 +873,15 @@ def mount_luksdev(where='/dev/mapper/luksdev', to='/mnt', *positionals, **kwargs def mount_boot(drive, partition, mountpoint='/mnt/boot', *positionals, **kwargs): os.makedirs('/mnt/boot', exist_ok=True) - o = b''.join(sys_command('/usr/bin/mount | /usr/bin/grep /mnt/boot', *positionals, **kwargs)) # /dev/dm-0 - print('MOUNT STUFF:', o) - if len(o) <= 0: - o = b''.join(sys_command(f'/usr/bin/mount {drive}{partition} {mountpoint}', *positionals, **kwargs)) - print('MOUNT STUFF2:', o) + #o = b''.join(sys_command('/usr/bin/mount | /usr/bin/grep /mnt/boot', *positionals, **kwargs)) # /dev/dm-0 + + check_mount = simple_command('/usr/bin/mount | /usr/bin/grep /mnt/boot', *positionals, **kwargs).decode('UTF-8').strip() + if len(check_mount): + return False + + o = b''.join(sys_command(f'/usr/bin/mount {drive}{partition} {mountpoint}', *positionals, **kwargs)) + print('MOUNT STUFF2:', o) + return True def mount_mountpoints(drive, bootpartition, mountpoint='/mnt/boot', *positionals, **kwargs): -- cgit v1.2.3-70-g09d2