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

Merge branch 'master' of github.com:Torxed/archinstall into aur-support

This commit is contained in:
Anton Hvornum 2019-11-13 21:24:23 +00:00
parent d9a986922c 43242d93e1
commit b685f35450
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archinstall.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python3 #!/usr/bin/python3
import traceback import traceback
import os, re, struct, sys, json, pty, shlex import os, re, struct, sys, json, pty, shlex
import urllib.request, urllib.parse, ssl import urllib.request, urllib.parse, ssl, signal
from glob import glob from glob import glob
from select import epoll, EPOLLIN, EPOLLHUP from select import epoll, EPOLLIN, EPOLLHUP
from socket import socket, inet_ntoa, AF_INET, AF_INET6, AF_PACKET from socket import socket, inet_ntoa, AF_INET, AF_INET6, AF_PACKET
@ -74,6 +74,14 @@ except:
return data return data
## FIXME: dependency checks (fdisk, lsblk etc) ## FIXME: dependency checks (fdisk, lsblk etc)
def sig_handler(signal, frame):
print('Aborting further installation steps!')
print(' Here\'s a summary of the commandline:')
print(f' {sys.argv}')
exit(0)
signal.signal(signal.SIGINT, sig_handler)
rootdir_pattern = re.compile('^.*?/devices') rootdir_pattern = re.compile('^.*?/devices')
harddrives = oDict() harddrives = oDict()
@ -607,10 +615,18 @@ if __name__ == '__main__':
# with open(args['pwfile'], 'r') as pw: # with open(args['pwfile'], 'r') as pw:
# PIN = pw.read().strip() # PIN = pw.read().strip()
print() print()
print('[!] Disk PASSWORD is: {}'.format(args['password'])) print('[!] Disk PASSWORD is: {}'.format(args['password']))
print() print()
for i in range(5, 0, -1):
print(f'Formatting in {i}...')
sleep(1)
if not args['rerun'] or args['ignore-rerun']: if not args['rerun'] or args['ignore-rerun']:
o = simple_command('/usr/bin/umount -R /mnt') o = simple_command('/usr/bin/umount -R /mnt')
o = simple_command('/usr/bin/cryptsetup close /dev/mapper/luksdev') o = simple_command('/usr/bin/cryptsetup close /dev/mapper/luksdev')