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

Removed support entirely for .json. Cleaning up the Profile() class **a lot**. Also tweaked some variable names to better suit the actual usage, which was a path definition not a name definition anymore

This commit is contained in:
Anton Hvornum 2020-08-05 10:29:34 +02:00
parent 11f36102db
commit 27e20ae433
1 changed files with 19 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
archinstall/lib/profiles.py
View File

@ -45,28 +45,28 @@ class Imported():
raise args[1] raise args[1]
class Profile(): class Profile():
def __init__(self, installer, name, args={}): def __init__(self, installer, path, args={}):
self.name = name self._path = path
self.installer = installer self.installer = installer
self._cache = None self._cache = None
self.args = args self.args = args
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
return f'Profile({self.name} <"{self.path}">)' return f'Profile({self._path} <"{self.path}">)'
@property @property
def path(self, *args, **kwargs): def path(self, *args, **kwargs):
if os.path.isfile(f'{self.name}'): if os.path.isfile(f'{self._path}'):
return os.path.abspath(f'{self.name}') return os.path.abspath(f'{self._path}')
for path in ['./profiles', '/etc/archinstall', '/etc/archinstall/profiles', os.path.abspath(f'{os.path.dirname(__file__)}/../profiles')]: # Step out of /lib for path in ['./profiles', '/etc/archinstall', '/etc/archinstall/profiles', os.path.abspath(f'{os.path.dirname(__file__)}/../profiles')]: # Step out of /lib
if os.path.isfile(f'{path}/{self.name}.py'): if os.path.isfile(f'{path}/{self._path}.py'):
return os.path.abspath(f'{path}/{self.name}.py') return os.path.abspath(f'{path}/{self._path}.py')
try: try:
if (cache := grab_url_data(f'{UPSTREAM_URL}/{self.name}.py')): if (cache := grab_url_data(f'{UPSTREAM_URL}/{self._path}.py')):
self._cache = cache self._cache = cache
return f'{UPSTREAM_URL}/{self.name}.py' return f'{UPSTREAM_URL}/{self._path}.py'
except urllib.error.HTTPError: except urllib.error.HTTPError:
pass pass
@ -85,7 +85,7 @@ class Profile():
else: else:
raise ProfileError(f'Extension {os.path.splitext(absolute_path)[1]} is not a supported profile model. Only .py is supported.') raise ProfileError(f'Extension {os.path.splitext(absolute_path)[1]} is not a supported profile model. Only .py is supported.')
raise ProfileError(f'No such profile ({self.name}) was found either locally or in {UPSTREAM_URL}') raise ProfileError(f'No such profile ({self._path}) was found either locally or in {UPSTREAM_URL}')
def install(self): def install(self):
# To avoid profiles importing the wrong 'archinstall', # To avoid profiles importing the wrong 'archinstall',
@ -102,98 +102,27 @@ class Profile():
# TODO: Remove # TODO: Remove
__builtins__['installation'] = self.installer __builtins__['installation'] = self.installer
with instructions as runtime: with instructions as runtime:
log(f'Profile {self.name} finished successfully.', bg='black', fg='green') log(f'Profile {self._path} finished successfully.', bg='black', fg='green')
else:
if 'args' in instructions:
self.args = instructions['args']
if 'post' in instructions:
instructions = instructions['post']
for title in instructions:
log(f'Running post installation step {title}')
log('[N] Network Deploy: {}'.format(title))
if type(instructions[title]) == str:
log('[N] Loading {} configuration'.format(instructions[title]))
log(f'Loading {instructions[title]} configuration')
instructions[title] = Application(self.installer, instructions[title], args=self.args)
instructions[title].install()
else:
for command in instructions[title]:
raw_command = command
opts = instructions[title][command] if type(instructions[title][command]) in (dict, OrderedDict) else {}
if len(opts):
if 'pass-args' in opts or 'format' in opts:
command = command.format(**self.args)
## FIXME: Instead of deleting the two options
## in order to mute command output further down,
## check for a 'debug' flag per command and delete these two
if 'pass-args' in opts:
del(opts['pass-args'])
elif 'format' in opts:
del(opts['format'])
if 'pass-args' in opts and opts['pass-args']:
command = command.format(**self.args)
if 'runas' in opts and f'su - {opts["runas"]} -c' not in command:
command = command.replace('"', '\\"')
command = f'su - {opts["runas"]} -c "{command}"'
if 'no-chroot' in opts and opts['no-chroot']:
log(f'Executing {command} as simple command from live-cd.')
o = sys_command(command, opts)
elif 'chroot' in opts and opts['chroot']:
log(f'Executing {command} in chroot.')
## Run in a manually set up version of arch-chroot (arch-chroot will break namespaces).
## This is a bit risky in case the file systems changes over the years, but we'll probably be safe adding this as an option.
## **> Prefer if possible to use 'no-chroot' instead which "live boots" the OS and runs the command.
o = sys_command(f"mount /dev/mapper/luksdev {self.installer.mountpoint}")
o = sys_command(f"cd {self.installer.mountpoint}; cp /etc/resolv.conf etc")
o = sys_command(f"cd {self.installer.mountpoint}; mount -t proc /proc proc")
o = sys_command(f"cd {self.installer.mountpoint}; mount --make-rslave --rbind /sys sys")
o = sys_command(f"cd {self.installer.mountpoint}; mount --make-rslave --rbind /dev dev")
o = sys_command(f'chroot {self.installer.mountpoint} /bin/bash -c "{command}"')
o = sys_command(f"cd {self.installer.mountpoint}; umount -R dev")
o = sys_command(f"cd {self.installer.mountpoint}; umount -R sys")
o = sys_command(f"cd {self.installer.mountpoint}; umount -R proc")
else:
if 'boot' in opts and opts['boot']:
log(f'Executing {command} in boot mode.')
defaults = {
'login:' : 'root\n',
'Password:' : self.args['password']+'\n',
f'[root@{self.args["hostname"]} ~]#' : command+'\n',
}
if not 'events' in opts: opts['events'] = {}
events = {**defaults, **opts['events']}
del(opts['events'])
o = b''.join(sys_command(f'/usr/bin/systemd-nspawn -D {self.installer.mountpoint} -b --machine temporary', events=events))
else:
log(f'Executing {command} in with systemd-nspawn without boot.')
o = b''.join(sys_command(f'/usr/bin/systemd-nspawn -D {self.installer.mountpoint} --machine temporary {command}'))
if type(instructions[title][raw_command]) == bytes and len(instructions['post'][title][raw_command]) and not instructions['post'][title][raw_command] in o:
log(f'{command} failed: {o.decode("UTF-8")}')
log('[W] Post install command failed: {}'.format(o.decode('UTF-8')))
return True return True
class Application(Profile): class Application(Profile):
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
return f'Application({self.name} <"{self.path}">)' return f'Application({self._path} <"{self.path}">)'
@property @property
def path(self, *args, **kwargs): def path(self, *args, **kwargs):
if os.path.isfile(f'{self.name}'): if os.path.isfile(f'{self._path}'):
return os.path.abspath(f'{self.name}') return os.path.abspath(f'{self._path}')
for path in ['./applications', './profiles/applications', '/etc/archinstall/applications', '/etc/archinstall/profiles/applications', os.path.abspath(f'{os.path.dirname(__file__)}/../profiles/applications')]: for path in ['./applications', './profiles/applications', '/etc/archinstall/applications', '/etc/archinstall/profiles/applications', os.path.abspath(f'{os.path.dirname(__file__)}/../profiles/applications')]:
if os.path.isfile(f'{path}/{self.name}.py'): if os.path.isfile(f'{path}/{self._path}.py'):
return os.path.abspath(f'{path}/{self.name}.py') return os.path.abspath(f'{path}/{self._path}.py')
try: try:
if (cache := grab_url_data(f'{UPSTREAM_URL}/applications/{self.name}.py')): if (cache := grab_url_data(f'{UPSTREAM_URL}/applications/{self._path}.py')):
self._cache = cache self._cache = cache
return f'{UPSTREAM_URL}/applications/{self.name}.py' return f'{UPSTREAM_URL}/applications/{self._path}.py'
except urllib.error.HTTPError: except urllib.error.HTTPError:
pass pass