feat: verbose installation logs, improved auto-partitioning logic, and UI tweaks
This commit is contained in:
@@ -1,18 +1,58 @@
|
||||
import subprocess
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
from contextlib import contextmanager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class CommandResult:
|
||||
def __init__(self, stdout, stderr, returncode):
|
||||
self.stdout = stdout
|
||||
self.stderr = stderr
|
||||
self.returncode = returncode
|
||||
|
||||
def run_command(cmd, check=True):
|
||||
logger.info(f"Running command: {' '.join(cmd)}")
|
||||
try:
|
||||
result = subprocess.run(cmd, check=check, capture_output=True, text=True)
|
||||
return result
|
||||
except subprocess.CalledProcessError as e:
|
||||
logger.error(f"Command failed: {e.stderr}")
|
||||
raise
|
||||
|
||||
process = subprocess.Popen(
|
||||
cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
text=True,
|
||||
bufsize=1 # Line buffered
|
||||
)
|
||||
|
||||
stdout_lines = []
|
||||
stderr_lines = []
|
||||
|
||||
# Helper to read stream
|
||||
def read_stream(stream, line_list, log_level):
|
||||
for line in stream:
|
||||
line_clean = line.strip()
|
||||
if line_clean:
|
||||
log_level(line_clean)
|
||||
line_list.append(line)
|
||||
|
||||
import threading
|
||||
t1 = threading.Thread(target=read_stream, args=(process.stdout, stdout_lines, logger.info))
|
||||
t2 = threading.Thread(target=read_stream, args=(process.stderr, stderr_lines, logger.error))
|
||||
|
||||
t1.start()
|
||||
t2.start()
|
||||
|
||||
t1.join()
|
||||
t2.join()
|
||||
|
||||
returncode = process.wait()
|
||||
|
||||
stdout_str = "".join(stdout_lines)
|
||||
stderr_str = "".join(stderr_lines)
|
||||
|
||||
if check and returncode != 0:
|
||||
raise subprocess.CalledProcessError(returncode, cmd, output=stdout_str, stderr=stderr_str)
|
||||
|
||||
return CommandResult(stdout_str, stderr_str, returncode)
|
||||
|
||||
@contextmanager
|
||||
def mount_pseudo_fs(mount_root):
|
||||
@@ -86,12 +126,16 @@ def configure_system(mount_root, partition_info):
|
||||
|
||||
root_uuid = get_uuid(partition_info["root"])
|
||||
efi_uuid = get_uuid(partition_info["efi"])
|
||||
swap_uuid = get_uuid(partition_info["swap"])
|
||||
|
||||
swap_entry = ""
|
||||
if partition_info.get("swap"):
|
||||
swap_uuid = get_uuid(partition_info["swap"])
|
||||
swap_entry = f"UUID={swap_uuid} none swap defaults 0 0\n"
|
||||
|
||||
fstab_content = f"""
|
||||
UUID={root_uuid} / ext4 defaults 1 1
|
||||
UUID={efi_uuid} /boot/efi vfat defaults 0 2
|
||||
UUID={swap_uuid} none swap defaults 0 0
|
||||
{swap_entry}
|
||||
"""
|
||||
os.makedirs(os.path.join(mount_root, "etc"), exist_ok=True)
|
||||
with open(os.path.join(mount_root, "etc/fstab"), "w") as f:
|
||||
|
||||
Reference in New Issue
Block a user