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-19 00:46:27 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2019-11-19 00:46:27 +0000
commit1c7077029b2cdce1d0e331c0d464a32ceb15533b (patch)
treeb03e445874251608ab9bd3e247577544c825ef64
parent161f35d9bd0fde0917341d67c7f0f362d595309f (diff)
debugging
-rw-r--r--archinstall.py14
1 files 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):