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

New function: prerequisit_check(). Moved the exit-if-not-uefi logic into a function instead of hard-crashing whoever imports the library. This way tho, it's up to the user to run the check. TODO: Add a warning message if the function isn't run beforehand.

This commit is contained in:
Anton Hvornum 2020-03-16 11:46:57 +01:00
parent f800d44b2d
commit b5a9702230
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archinstall.py
View File

@ -13,10 +13,6 @@ from string import ascii_uppercase, ascii_lowercase, digits
from hashlib import sha512 from hashlib import sha512
from threading import Thread, enumerate as tenum from threading import Thread, enumerate as tenum
if not os.path.isdir('/sys/firmware/efi'):
print('[E] This script only supports UEFI-booted machines.')
exit(1)
if os.path.isfile('./SAFETY_LOCK'): if os.path.isfile('./SAFETY_LOCK'):
SAFETY_LOCK = True SAFETY_LOCK = True
else: else:
@ -1219,7 +1215,18 @@ def create_user(username, password='', groups=[]):
o = (f'/usr/bin/arch-chroot /mnt gpasswd -a {username} {group}') o = (f'/usr/bin/arch-chroot /mnt gpasswd -a {username} {group}')
return True return True
def prerequisit_check():
if not os.path.isdir('/sys/firmware/efi'):
return False, 'Archinstall only supports UEFI-booted machines.'
return True
if __name__ == '__main__': if __name__ == '__main__':
if not (prereq := prerequisit_check()) is True:
print(f'[E] {prereq[1]}')
exit(1)
## Setup some defaults ## Setup some defaults
# (in case no command-line parameters or netdeploy-params were given) # (in case no command-line parameters or netdeploy-params were given)
args = setup_args_defaults(args) args = setup_args_defaults(args)