From f31d5e34cdfe9594678316dc100d8c381aac1f43 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 22:42:07 +0100 Subject: Trying to centralize the configuration for logging. Phasing out some parameters which also affects the current ability to create multiple log files for multiple runs. This will be re-introduced when logging is made into a class object in a later version --- archinstall/lib/disk.py | 6 +++--- archinstall/lib/installer.py | 12 +++++++++--- archinstall/lib/luks.py | 2 +- archinstall/lib/mirrors.py | 2 +- archinstall/lib/output.py | 30 +++++++++++++++--------------- archinstall/lib/storage.py | 4 +++- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index e9fa12a0..c14cb48c 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -119,7 +119,7 @@ class Partition(): return f'Partition(path={self.path}, fs={self.filesystem}, mounted={self.mountpoint})' def format(self, filesystem): - log(f'Formatting {self} -> {filesystem}', level=LOG_LEVELS.Info, file=storage.get('logfile', None)) + log(f'Formatting {self} -> {filesystem}', level=LOG_LEVELS.Info) if filesystem == 'btrfs': o = b''.join(sys_command(f'/usr/bin/mkfs.btrfs -f {self.path}')) if b'UUID' not in o: @@ -162,7 +162,7 @@ class Partition(): def mount(self, target, fs=None, options=''): if not self.mountpoint: - log(f'Mounting {self} to {target}', level=LOG_LEVELS.Info, file=storage.get('logfile', None)) + log(f'Mounting {self} to {target}', level=LOG_LEVELS.Info) if not fs: if not self.filesystem: raise DiskError(f'Need to format (or define) the filesystem on {self} before mounting.') fs = self.filesystem @@ -227,7 +227,7 @@ class Filesystem(): self.add_partition('primary', start='513MiB', end='100%', format='ext4') def add_partition(self, type, start, end, format=None): - log(f'Adding partition to {self.blockdevice}', level=LOG_LEVELS.Info, file=storage.get('logfile', None)) + log(f'Adding partition to {self.blockdevice}', level=LOG_LEVELS.Info) previous_partitions = self.blockdevice.partitions if format: diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 8c22b51f..025c15cb 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -34,13 +34,19 @@ class Installer(): :type hostname: str, optional """ - def __init__(self, partition, boot_partition, *, base_packages='base base-devel linux linux-firmware efibootmgr nano', profile=None, mountpoint='/mnt', hostname='ArchInstalled'): + def __init__(self, partition, boot_partition, *, base_packages='base base-devel linux linux-firmware efibootmgr nano', profile=None, mountpoint='/mnt', hostname='ArchInstalled', logdir=None, logfile=None): self.profile = profile self.hostname = hostname self.mountpoint = mountpoint self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S') self.milliseconds = int(str(time.time()).split('.')[1]) + + if logdir: + storage['LOG_PATH'] = logdir + if logfile: + storage['LOG_FILE'] = logfile + self.helper_flags = { 'bootloader' : False, 'base' : False, @@ -53,7 +59,7 @@ class Installer(): self.partition = partition self.boot_partition = boot_partition - def log(self, *args, level=LOG_LEVELS.Debug, file=None, **kwargs): + def log(self, *args, level=LOG_LEVELS.Debug, **kwargs): if not file: if 'logfile' not in storage: log_root = os.path.join(os.path.expanduser('~/'), '.cache/archinstall') @@ -64,7 +70,7 @@ class Installer(): file = storage['logfile'] - log(*args, level=level, file=file, **kwargs) + log(*args, level=level, **kwargs) def __enter__(self, *args, **kwargs): self.partition.mount(self.mountpoint) diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py index 7dfa9edc..1c78bc83 100644 --- a/archinstall/lib/luks.py +++ b/archinstall/lib/luks.py @@ -26,7 +26,7 @@ class luks2(): def encrypt(self, partition, password, key_size=512, hash_type='sha512', iter_time=10000, key_file=None): # TODO: We should be able to integrate this into the main log some how. # Perhaps post-mortem? - log(f'Encrypting {partition}', level=LOG_LEVELS.Info, file=storage.get('logfile', None)) + log(f'Encrypting {partition}', level=LOG_LEVELS.Info) if not key_file: key_file = f"/tmp/{os.path.basename(self.partition.path)}.disk_pw" # TODO: Make disk-pw-file randomly unique? diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py index 6649ebfd..d7d35782 100644 --- a/archinstall/lib/mirrors.py +++ b/archinstall/lib/mirrors.py @@ -59,7 +59,7 @@ def insert_mirrors(mirrors, *args, **kwargs): return True def use_mirrors(regions :dict, destination='/etc/pacman.d/mirrorlist'): - log(f'A new package mirror-list has been created: {destination}', level=LOG_LEVELS.Info, file=storage.get('logfile', None)) + log(f'A new package mirror-list has been created: {destination}', level=LOG_LEVELS.Info) for region, mirrors in regions.items(): with open(destination, 'w') as mirrorlist: for mirror in mirrors: diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index 3c1b12e2..267f2635 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -2,6 +2,7 @@ import abc import os import sys import logging +from pathlib import Path from .storage import storage class LOG_LEVELS: @@ -76,30 +77,28 @@ def stylize_output(text :str, *opts, **kwargs): def log(*args, **kwargs): string = orig_string = ' '.join([str(x) for x in args]) + # Attempt to colorize the output if supported + # Insert default colors and override with **kwargs if supports_color(): kwargs = {'bg' : 'black', 'fg': 'white', **kwargs} string = stylize_output(string, **kwargs) - if (logfile := storage.get('logfile', None)) and 'file' not in kwargs: - kwargs['file'] = logfile + # If a logfile is defined in storage, + # we use that one to output everything + if (logfile := storage.get('LOG_FILE', None)): + absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), logfile) + if not os.path.isfile(absolute_logfile): + os.makedirs(os.path.dirname(absolute_logfile)) + Path(absolute_logfile).touch() # Overkill? - # Log to a file output unless specifically told to suppress this feature. - # (level has no effect on the log file, everything will be written there) - if 'file' in kwargs and ('suppress' not in kwargs or kwargs['suppress'] == False): - if type(kwargs['file']) is str: - with open(kwargs['file'], 'a') as log_file: - log_file.write(f"{orig_string}\n") - elif kwargs['file']: - kwargs['file'].write(f"{orig_string}\n") + with open(absolute_logfile, 'a') as log_file: + logfile.write(f"{orig_string}\n") # If we assigned a level, try to log it to systemd's journald. # Unless the level is higher than we've decided to output interactively. # (Remember, log files still get *ALL* the output despite level restrictions) if 'level' in kwargs: - if 'LOG_LEVEL' not in storage: - storage['LOG_LEVEL'] = LOG_LEVELS.Info - - if kwargs['level'] > storage['LOG_LEVEL']: + if kwargs['level'] > storage.get('LOG_LEVEL', LOG_LEVELS.Info): # Level on log message was Debug, but output level is set to Info. # In that case, we'll drop it. return None @@ -111,4 +110,5 @@ def log(*args, **kwargs): # Finally, print the log unless we skipped it based on level. # And we print the string which may or may not contain color formatting. - print(string) \ No newline at end of file + sys.stdout.write(string) + sys.stdout.flush() \ No newline at end of file diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py index 3af15153..e881700f 100644 --- a/archinstall/lib/storage.py +++ b/archinstall/lib/storage.py @@ -15,5 +15,7 @@ storage = { #os.path.abspath(f'{os.path.dirname(__file__)}/../examples') ], 'UPSTREAM_URL' : 'https://raw.githubusercontent.com/Torxed/archinstall/master/profiles', - 'PROFILE_DB' : None # Used in cases when listing profiles is desired, not mandatory for direct profile grabing. + 'PROFILE_DB' : None, # Used in cases when listing profiles is desired, not mandatory for direct profile grabing. + 'LOG_PATH' : '/var/log/archinstall', + 'LOG_FILE' : 'install.log' } -- cgit v1.2.3-70-g09d2 From 828a09b9c8750dfb582ccd12d79fa7faa4512415 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 22:57:16 +0100 Subject: Simpligied installer.log() to wrap output.log() with it's changes. --- archinstall/lib/installer.py | 15 ++++----------- archinstall/lib/output.py | 8 +++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 025c15cb..1218b840 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -41,7 +41,6 @@ class Installer(): self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S') self.milliseconds = int(str(time.time()).split('.')[1]) - if logdir: storage['LOG_PATH'] = logdir if logfile: @@ -60,16 +59,10 @@ class Installer(): self.boot_partition = boot_partition def log(self, *args, level=LOG_LEVELS.Debug, **kwargs): - if not file: - if 'logfile' not in storage: - log_root = os.path.join(os.path.expanduser('~/'), '.cache/archinstall') - if not os.path.isdir(log_root): - os.makedirs(log_root) - - storage['logfile'] = f"{log_root}/install-session_{self.init_time}.{self.milliseconds}.log" - - file = storage['logfile'] - + """ + installer.log() wraps output.log() mainly to set a default log-level for this install session. + Any manual override can be done per log() call. + """ log(*args, level=level, **kwargs) def __enter__(self, *args, **kwargs): diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index 267f2635..52b2ce2c 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -37,6 +37,11 @@ class journald(dict): # Fallback logger log_adapter.debug(message) +# TODO: Replace log() for session based logging. +class SessionLogging(): + def __init__(self): + pass + # Found first reference here: https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python # And re-used this: https://github.com/django/django/blob/master/django/core/management/color.py#L12 def supports_color(): @@ -109,6 +114,7 @@ def log(*args, **kwargs): pass # Ignore writing to journald # Finally, print the log unless we skipped it based on level. - # And we print the string which may or may not contain color formatting. + # We use sys.stdout.write()+flush() instead of print() to try and + # fix issue #94 sys.stdout.write(string) sys.stdout.flush() \ No newline at end of file -- cgit v1.2.3-70-g09d2 From ca2408a3d290a37d0b955ea3368f7eabb73d20a3 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 23:31:41 +0100 Subject: Mixup with variable name --- archinstall/lib/output.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index 52b2ce2c..baa454ec 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -90,14 +90,14 @@ def log(*args, **kwargs): # If a logfile is defined in storage, # we use that one to output everything - if (logfile := storage.get('LOG_FILE', None)): - absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), logfile) + if (filename := storage.get('LOG_FILE', None)): + absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename) if not os.path.isfile(absolute_logfile): os.makedirs(os.path.dirname(absolute_logfile)) Path(absolute_logfile).touch() # Overkill? with open(absolute_logfile, 'a') as log_file: - logfile.write(f"{orig_string}\n") + log_file.write(f"{orig_string}\n") # If we assigned a level, try to log it to systemd's journald. # Unless the level is higher than we've decided to output interactively. -- cgit v1.2.3-70-g09d2 From 73191b921efc206a518276379a4484807e052d85 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 23:38:20 +0100 Subject: terminus font has changed name upstream from terminus-font-otb to terminus-font. Which is one (of probably many) fonts that is required for awesome to render text in menu's etc. --- profiles/applications/awesome.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/applications/awesome.py b/profiles/applications/awesome.py index db7e8f4f..578f246e 100644 --- a/profiles/applications/awesome.py +++ b/profiles/applications/awesome.py @@ -3,7 +3,7 @@ import archinstall installation.install_profile('xorg') installation.add_additional_packages( - "awesome xorg-xrandr xterm feh slock terminus-font-otb gnu-free-fonts ttf-liberation xsel" + "awesome xorg-xrandr xterm feh slock terminus-font gnu-free-fonts ttf-liberation xsel" ) with open(f'{installation.mountpoint}/etc/X11/xinit/xinitrc', 'r') as xinitrc: -- cgit v1.2.3-70-g09d2 From a58331868e784886764873c7d85573d74f36248a Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 23:41:45 +0100 Subject: Added debug output as well as corrected output formatting in log(). --- archinstall/lib/luks.py | 2 +- archinstall/lib/output.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archinstall/lib/luks.py b/archinstall/lib/luks.py index 1c78bc83..e1f14bab 100644 --- a/archinstall/lib/luks.py +++ b/archinstall/lib/luks.py @@ -26,7 +26,7 @@ class luks2(): def encrypt(self, partition, password, key_size=512, hash_type='sha512', iter_time=10000, key_file=None): # TODO: We should be able to integrate this into the main log some how. # Perhaps post-mortem? - log(f'Encrypting {partition}', level=LOG_LEVELS.Info) + log(f'Encrypting {partition} (This might take a while)', level=LOG_LEVELS.Info) if not key_file: key_file = f"/tmp/{os.path.basename(self.partition.path)}.disk_pw" # TODO: Make disk-pw-file randomly unique? diff --git a/archinstall/lib/output.py b/archinstall/lib/output.py index baa454ec..956ad0c4 100644 --- a/archinstall/lib/output.py +++ b/archinstall/lib/output.py @@ -116,5 +116,5 @@ def log(*args, **kwargs): # Finally, print the log unless we skipped it based on level. # We use sys.stdout.write()+flush() instead of print() to try and # fix issue #94 - sys.stdout.write(string) + sys.stdout.write(f"{string}\n") sys.stdout.flush() \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 9a94a632bfdcbc71b19ee23055296ad7e43987fa Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 24 Jan 2021 23:52:17 +0100 Subject: Slimmed the awesome WM profile a bit more. added a TODO to ask the users to select a browser rather than 'forcing' one on them --- profiles/awesome.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/profiles/awesome.py b/profiles/awesome.py index 27e7fc05..0e027714 100644 --- a/profiles/awesome.py +++ b/profiles/awesome.py @@ -31,25 +31,24 @@ if __name__ == 'awesome': # Then setup and configure the desktop environment: awesome editor = "nano" filebrowser = "nemo gpicview-gtk3" - webbrowser = "chromium" - virtulization = "qemu ovmf" - utils = "openssh sshfs git htop pkgfile scrot dhclient wget smbclient cifs-utils libu2f-host" + webbrowser = "chromium" # TODO: Ask the user to select one instead + utils = "openssh sshfs git htop pkgfile scrot dhclient wget libu2f-host" - installation.add_additional_packages(f"{webbrowser} {utils} {virtulization} {filebrowser} {editor}") + installation.add_additional_packages(f"{webbrowser} {utils} {filebrowser} {editor}") alacritty = archinstall.Application(installation, 'alacritty') alacritty.install() # TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead. - with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as awesome_rc_lua: - awesome_lua = awesome_rc_lua.read() + with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'r') as fh: + awesome_lua = fh.read() ## Replace xterm with alacritty for a smoother experience. - awesome_lua = awesome_rc_lua.replace('"xterm"', '"alacritty"') + awesome_lua = awesome_lua.replace('"xterm"', '"alacritty"') - with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as awesome_rc_lua: - awesome_rc_lua.write(awesome_lua) + with open(f'{installation.mountpoint}/etc/xdg/awesome/rc.lua', 'w') as fh: + fh.write(awesome_lua) ## TODO: Configure the right-click-menu to contain the above packages that were installed. (as a user config) -- cgit v1.2.3-70-g09d2 From 435d2f687eda1548e56270787b11f024e2a8e08d Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 25 Jan 2021 00:09:34 +0100 Subject: Added some more fields to the configuration output, as well as added a better fail safe for the logging output. Any exception during the installation will be caught by __exit__ in Installer(), hopefully. --- archinstall/lib/general.py | 6 +++--- archinstall/lib/installer.py | 1 + examples/guided.py | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index 203f5fa9..dc94b063 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -245,9 +245,9 @@ class sys_command():#Thread): self.exit_code = 0 if self.exit_code != 0 and not self.kwargs['suppress_errors']: - self.log(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.", level=LOG_LEVELS.Error) - self.log(self.trace_log.decode('UTF-8'), level=LOG_LEVELS.Debug) - raise SysCallError(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.\n{self.trace_log.decode('UTF-8')}") + #self.log(self.trace_log.decode('UTF-8'), level=LOG_LEVELS.Debug) + #self.log(f"'{self.raw_cmd}' did not exit gracefully, exit code {self.exit_code}.", level=LOG_LEVELS.Error) + raise SysCallError(f"{self.trace_log.decode('UTF-8')}\n'{self.raw_cmd}' did not exit gracefully (trace log above), exit code: {self.exit_code}") self.ended = time.time() with open(f'{self.cwd}/trace.log', 'wb') as fh: diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 1218b840..48198635 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -75,6 +75,7 @@ class Installer(): # b''.join(sys_command(f'sync')) # No need to, since the underlaying fs() object will call sync. # TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager if len(args) >= 2 and args[1]: + self.log(args[1], level=LOG_LEVELS.Error) raise args[1] self.genfstab() diff --git a/examples/guided.py b/examples/guided.py index 7726d5b9..f6c80969 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -85,6 +85,7 @@ archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', suppress_error if len(keyboard_language := archinstall.select_language(archinstall.list_keyboard_languages()).strip()): archinstall.set_keyboard_language(keyboard_language) + archinstall.storage['_guided']['keyboard_layout'] = keyboard_language # Create a storage structure for all our information. # We'll print this right before the user gets informed about the formatting timer. @@ -102,6 +103,7 @@ while (disk_password := getpass.getpass(prompt='Enter disk encryption password ( if disk_password != disk_password_verification: archinstall.log(' * Passwords did not match * ', bg='black', fg='red') continue + archinstall.storage['_guided']['disk_encryption'] = True break archinstall.storage['_guided']['harddrive'] = harddrive @@ -118,7 +120,10 @@ while (root_pw := getpass.getpass(prompt='Enter root password (leave blank to le archinstall.log(' * Passwords did not match * ', bg='black', fg='red') continue + # Storing things in _guided_hidden helps us avoid printing it + # when echoing user configuration: archinstall.storage['_guided'] archinstall.storage['_guided_hidden']['root_pw'] = root_pw + archinstall.storage['_guided']['root_unlocked'] = True break # Ask for additional users (super-user if root pw was not set) -- cgit v1.2.3-70-g09d2 From 40622265a214be0531482ee91ffa61ef2431ae43 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 25 Jan 2021 00:11:34 +0100 Subject: Simplified the code a bit by removing the log file setup. It's not handled by archinstall.output.log(). Also moved two variable setups to the top. --- examples/guided.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/examples/guided.py b/examples/guided.py index f6c80969..9252d235 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -1,15 +1,10 @@ import getpass, time, json, sys, signal, os import archinstall -# Setup a global log file. -# Archinstall will honor storage['logfile'] in most of it's functions log handle. -log_root = os.path.join(os.path.expanduser('~/'), '.cache/archinstall') -if not os.path.isdir(log_root): - os.makedirs(log_root) - -init_time = time.strftime('%Y-%m-%d_%H-%M-%S') -milliseconds = int(str(time.time()).split('.')[1]) -archinstall.storage['logfile'] = f"{log_root}/install-session_{init_time}.{milliseconds}.log" +# Create a storage structure for all our information. +# We'll print this right before the user gets informed about the formatting timer. +archinstall.storage['_guided'] = {} +archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things. """ This signal-handler chain (and global variable) @@ -77,6 +72,7 @@ def perform_installation(device, boot_partition, language, mirrors): archinstall.sys_command(f'umount -R /mnt', suppress_errors=True) archinstall.sys_command(f'cryptsetup close /dev/mapper/luksloop', suppress_errors=True) + """ First, we'll ask the user for a bunch of user input. Not until we're satisfied with what we want to install @@ -87,11 +83,6 @@ if len(keyboard_language := archinstall.select_language(archinstall.list_keyboar archinstall.set_keyboard_language(keyboard_language) archinstall.storage['_guided']['keyboard_layout'] = keyboard_language -# Create a storage structure for all our information. -# We'll print this right before the user gets informed about the formatting timer. -archinstall.storage['_guided'] = {} -archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things. - # Set which region to download packages from during the installation mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors()) archinstall.storage['_guided']['mirrors'] = mirror_regions -- cgit v1.2.3-70-g09d2 From 7eaee2cd4817c1aaca013f8baa267ddf4503f678 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 25 Jan 2021 00:25:15 +0100 Subject: Added a little print out to inform the user about where to find the log file on a crash. --- archinstall/lib/installer.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 48198635..2ea5c60e 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -75,7 +75,11 @@ class Installer(): # b''.join(sys_command(f'sync')) # No need to, since the underlaying fs() object will call sync. # TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager if len(args) >= 2 and args[1]: + #self.log(self.trace_log.decode('UTF-8'), level=LOG_LEVELS.Debug) self.log(args[1], level=LOG_LEVELS.Error) + + print(f"[!] A log file has been created here: {os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])}") + print(f" Please submit this issue (and file) to https://github.com/Torxed/archinstall/issues") raise args[1] self.genfstab() -- cgit v1.2.3-70-g09d2 From 165d4ebc7f420d99eef453b785a86a51ceec8669 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 26 Jan 2021 00:44:34 +0100 Subject: Synced over the install log to the install medium upon Installer() __exit__. Default storage is /var/log/archinstall/install.log but can be configured in storage.py. This will include crash dumps and a identical copy is found in the ISO as well, in case the users starts looking in /var/log/archinstall in the ISO medium. --- archinstall/lib/installer.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 99c5506b..c4cdf857 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -75,10 +75,15 @@ class Installer(): def __exit__(self, *args, **kwargs): # b''.join(sys_command(f'sync')) # No need to, since the underlaying fs() object will call sync. # TODO: https://stackoverflow.com/questions/28157929/how-to-safely-handle-an-exception-inside-a-context-manager + if len(args) >= 2 and args[1]: #self.log(self.trace_log.decode('UTF-8'), level=LOG_LEVELS.Debug) self.log(args[1], level=LOG_LEVELS.Error) + self.sync_log_to_install_medium() + + # We avoid printing /mnt/ because that might confuse people if they note it down + # and then reboot, and a identical log file will be found in the ISO medium anyway. print(f"[!] A log file has been created here: {os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])}") print(f" Please submit this issue (and file) to https://github.com/Torxed/archinstall/issues") raise args[1] @@ -87,6 +92,7 @@ class Installer(): if not (missing_steps := self.post_install_check()): self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=LOG_LEVELS.Info) + self.sync_log_to_install_medium() return True else: self.log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red', level=LOG_LEVELS.Warning) @@ -94,8 +100,23 @@ class Installer(): self.log(f' - {step}', bg='black', fg='red', level=LOG_LEVELS.Warning) self.log(f"Detailed error logs can be found at: {log_path}", level=LOG_LEVELS.Warning) self.log(f"Submit this zip file as an issue to https://github.com/Torxed/archinstall/issues", level=LOG_LEVELS.Warning) + self.sync_log_to_install_medium() return False + def sync_log_to_install_medium(self): + # Copy over the install log (if there is one) to the install medium if + # at least the base has been strapped in, otherwise we won't have a filesystem/structure to copy to. + if self.helper_flags.get('base-strapped', False) is True: + if (filename := storage.get('LOG_FILE', None)): + absolute_logfile = os.path.join(storage.get('LOG_PATH', './'), filename) + + if not os.path.isdir(f"{self.mountpoint}/{os.path.dirname(absolute_logfile)}"): + os.makedirs(f"{self.mountpoint}/{os.path.dirname(absolute_logfile)}") + + shutil.copy2(absolute_logfile, f"{self.mountpoint}/{absolute_logfile}") + + return True + def mount(self, partition, mountpoint, create_mountpoint=True): if create_mountpoint and not os.path.isdir(f'{self.mountpoint}{mountpoint}'): os.makedirs(f'{self.mountpoint}{mountpoint}') @@ -239,6 +260,7 @@ class Installer(): if self.partition.filesystem == 'xfs': self.base_packages.append('xfsprogs') self.pacstrap(self.base_packages) + self.helper_flags['base-strapped'] = True #self.genfstab() with open(f"{self.mountpoint}/etc/fstab", "a") as fstab: -- cgit v1.2.3-70-g09d2