| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk/helpers.py | 11 | ||||
| -rw-r--r-- | archinstall/lib/general.py | 7 |
diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index e15e69b2..fea9ef65 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -182,9 +182,16 @@ def get_filesystem_type(path): def disk_layouts(): try: - return json.loads(SysCommand("lsblk -f -o+TYPE,SIZE -J").decode('UTF-8')) + if (handle := SysCommand("lsblk -f -o+TYPE,SIZE -J")).exit_code == 0: + return json.loads(handle.decode('UTF-8')) + else: + log(f"Could not return disk layouts: {handle}", level=logging.WARNING, fg="yellow") + return None except SysCallError as err: - log(f"Could not return disk layouts: {err}") + log(f"Could not return disk layouts: {err}", level=logging.WARNING, fg="yellow") + return None + except json.decoder.JSONDecodeError as err: + log(f"Could not return disk layouts: {err}", level=logging.WARNING, fg="yellow") return None diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index f3773755..ee088d4f 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -308,9 +308,16 @@ class SysCommandWorker: if not self.pid: try: + try: + with open(f"{storage['LOG_PATH']}/cmd_history.txt", "a") as cmd_log: + cmd_log.write(f"{' '.join(self.cmd)}\n") + except PermissionError: + pass + os.execve(self.cmd[0], self.cmd, {**os.environ, **self.environment_vars}) if storage['arguments'].get('debug'): log(f"Executing: {self.cmd}", level=logging.DEBUG) + except FileNotFoundError: log(f"{self.cmd[0]} does not exist.", level=logging.ERROR, fg="red") self.exit_code = 1 |