RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a output message

This commit is contained in:
Anton Hvornum 2019-04-11 21:15:17 +02:00
parent 3fb42df162
commit 80d7fca43d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall.py
View File

@ -205,7 +205,7 @@ def update_git():
if os.path.isfile('/root/archinstall/README.md'):
os.remove('/root/archinstall/README.md')
output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2))') # git reset --hard origin/<branch_name> / git fetch --all
output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2); git pull)')
print(output)
if b'error:' in output:
@ -466,8 +466,8 @@ if __name__ == '__main__':
exit(1)
o = sys_command('/usr/bin/cryptsetup open {drive}{partition_2} luksdev --key-file {pwfile} --type luks2'.format(**args)).exec()
o = sys_command('/usr/bin/file /dev/mapper/luksdev').exec() # /dev/dm-0
if b'cannot open' in b''.join(o):
o = b''.join(sys_command('/usr/bin/file /dev/mapper/luksdev').exec()) # /dev/dm-0
if b'cannot open' in o:
print('[E] Could not mount encrypted device.', o)
exit(1)