Compare commits
22 Commits
759b4c4007
...
testing
| Author | SHA1 | Date | |
|---|---|---|---|
| f7bebc7f88 | |||
| e611f174be | |||
| b70ff549a7 | |||
| bb31814233 | |||
| 00ba6e5c89 | |||
| 7d43b82ce1 | |||
| af86d357a4 | |||
| 848b2e7e74 | |||
| dc417d15d3 | |||
| 7a8e8ccbed | |||
| 7371da2451 | |||
| 9f5bade34c | |||
| 11fca148be | |||
| b7a049d86f | |||
| 2676da751b | |||
| 22e1fa8f62 | |||
| efe25f3e11 | |||
| 2f9338af0a | |||
| 33d989cfad | |||
| 2377b0269a | |||
| 3c4870b104 | |||
| aae235e81f |
@@ -1,5 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
|
<svg
|
||||||
<path d="M 8 1 C 4.132812 1 1 4.132812 1 8 C 1 11.867188 4.132812 15 8 15 C 11.867188 15 15 11.867188 15 8 C 15 4.132812 11.867188 1 8 1 Z M 8 3 C 10.761719 3 13 5.238281 13 8 C 13 10.761719 10.761719 13 8 13 C 5.238281 13 3 10.761719 3 8 C 3 5.238281 5.238281 3 8 3 Z M 8 3" fill="#2e3436"/>
|
height="16px"
|
||||||
<path d="M 8 5 C 6.34375 5 5 6.34375 5 8 C 5 9.65625 6.34375 11 8 11 C 9.65625 11 11 9.65625 11 8 C 11 6.34375 9.65625 5 8 5 Z M 8 6 C 9.105469 6 10 6.894531 10 8 C 10 9.105469 9.105469 10 8 10 C 6.894531 10 6 9.105469 6 8 C 6 6.894531 6.894531 6 8 6 Z M 8 6" fill="#2e3436"/>
|
viewBox="0 0 16 16"
|
||||||
</svg>
|
width="16px"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M 8 1 C 4.132812 1 1 4.132812 1 8 C 1 11.867188 4.132812 15 8 15 C 11.867188 15 15 11.867188 15 8 C 15 4.132812 11.867188 1 8 1 Z M 8 3 C 10.761719 3 13 5.238281 13 8 C 13 10.761719 10.761719 13 8 13 C 5.238281 13 3 10.761719 3 8 C 3 5.238281 5.238281 3 8 3 Z M 8 3"
|
||||||
|
fill="#2e3436"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M 8 5 C 6.34375 5 5 6.34375 5 8 C 5 9.65625 6.34375 11 8 11 C 9.65625 11 11 9.65625 11 8 C 11 6.34375 9.65625 5 8 5 Z M 8 6 C 9.105469 6 10 6.894531 10 8 C 10 9.105469 9.105469 10 8 10 C 6.894531 10 6 9.105469 6 8 C 6 6.894531 6.894531 6 8 6 Z M 8 6"
|
||||||
|
fill="#2e3436"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 711 B After Width: | Height: | Size: 772 B |
@@ -1,22 +1,39 @@
|
|||||||
<svg width="128" height="128" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
|
<svg
|
||||||
|
width="128"
|
||||||
|
height="128"
|
||||||
|
viewBox="0 0 128 128"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
<defs>
|
<defs>
|
||||||
<linearGradient id="circle-bg" x1="0%" y1="0%" x2="0%" y2="100%">
|
<linearGradient id="circle-bg" x1="0%" y1="0%" x2="0%" y2="100%">
|
||||||
<stop offset="0%" stop-color="#5E5C64"/>
|
<stop offset="0%" stop-color="#5E5C64" />
|
||||||
<stop offset="100%" stop-color="#3D3846"/>
|
<stop offset="100%" stop-color="#3D3846" />
|
||||||
</linearGradient>
|
</linearGradient>
|
||||||
</defs>
|
</defs>
|
||||||
|
<circle cx="64" cy="64" r="56" fill="url(#circle-bg)" />
|
||||||
<!-- Background circle (dark gray) -->
|
<circle
|
||||||
<circle cx="64" cy="64" r="56" fill="url(#circle-bg)"/>
|
cx="64"
|
||||||
|
cy="64"
|
||||||
<!-- Yellow rings (GNOME yellow) -->
|
r="40"
|
||||||
<circle cx="64" cy="64" r="40" fill="none" stroke="#F6D32D" stroke-width="8"
|
fill="none"
|
||||||
stroke-dasharray="75 25" stroke-linecap="round" opacity="0.9"/>
|
stroke="#F6D32D"
|
||||||
|
stroke-width="8"
|
||||||
<!-- Inner ring -->
|
stroke-dasharray="75 25"
|
||||||
<circle cx="64" cy="64" r="28" fill="none" stroke="#F5C211" stroke-width="4"
|
stroke-linecap="round"
|
||||||
stroke-dasharray="45 20" stroke-linecap="round" opacity="0.8"/>
|
opacity="0.9"
|
||||||
|
/>
|
||||||
<!-- Center dot -->
|
|
||||||
<circle cx="64" cy="64" r="10" fill="#F6D32D"/>
|
<circle
|
||||||
</svg>
|
cx="64"
|
||||||
|
cy="64"
|
||||||
|
r="28"
|
||||||
|
fill="none"
|
||||||
|
stroke="#F5C211"
|
||||||
|
stroke-width="4"
|
||||||
|
stroke-dasharray="45 20"
|
||||||
|
stroke-linecap="round"
|
||||||
|
opacity="0.8"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<circle cx="64" cy="64" r="10" fill="#F6D32D" />
|
||||||
|
</svg>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 853 B After Width: | Height: | Size: 871 B |
0
iridium_installer/backend/__init__.py
Normal file
0
iridium_installer/backend/__init__.py
Normal file
321
iridium_installer/backend/disk.py
Normal file
321
iridium_installer/backend/disk.py
Normal file
@@ -0,0 +1,321 @@
|
|||||||
|
import subprocess
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Import network logging for critical disk operations
|
||||||
|
from .network_logging import log_to_discord
|
||||||
|
|
||||||
|
|
||||||
|
def log_disk_operation(operation, status="start", details=""):
|
||||||
|
log_to_discord("INFO", f"DISK_{operation}_{status}: {details}", module="disk")
|
||||||
|
|
||||||
|
|
||||||
|
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)}")
|
||||||
|
|
||||||
|
process = subprocess.Popen(
|
||||||
|
cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, bufsize=1
|
||||||
|
)
|
||||||
|
|
||||||
|
stdout_lines = []
|
||||||
|
stderr_lines = []
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
|
||||||
|
def get_partition_device(disk_device, partition_number):
|
||||||
|
"""
|
||||||
|
Returns the partition device path.
|
||||||
|
Handles NVMe style (p1) vs sd style (1).
|
||||||
|
"""
|
||||||
|
if disk_device[-1].isdigit():
|
||||||
|
return f"{disk_device}p{partition_number}"
|
||||||
|
return f"{disk_device}{partition_number}"
|
||||||
|
|
||||||
|
|
||||||
|
def get_total_memory():
|
||||||
|
"""Returns total system memory in bytes."""
|
||||||
|
try:
|
||||||
|
return os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES")
|
||||||
|
except (ValueError, OSError):
|
||||||
|
with open("/proc/meminfo", "r") as f:
|
||||||
|
for line in f:
|
||||||
|
if line.startswith("MemTotal:"):
|
||||||
|
parts = line.split()
|
||||||
|
return int(parts[1]) * 1024
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def get_disk_size(disk_device):
|
||||||
|
"""Returns disk size in bytes using blockdev."""
|
||||||
|
try:
|
||||||
|
res = run_command(["blockdev", "--getsize64", disk_device])
|
||||||
|
return int(res.stdout.strip())
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to get disk size: {e}")
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def auto_partition_disk(disk_device):
|
||||||
|
"""
|
||||||
|
Automatically partitions the disk:
|
||||||
|
1. EFI System Partition (2GB standard, 1GB small)
|
||||||
|
2. Root (Remaining)
|
||||||
|
3. Swap (RAM + 2GB, or 0 if small)
|
||||||
|
|
||||||
|
Layout: P1=EFI, P3=Swap (End), P2=Root (Middle)
|
||||||
|
"""
|
||||||
|
logger.info(f"Starting auto-partitioning on {disk_device}")
|
||||||
|
log_disk_operation("PARTITION", "start", f"Disk: {disk_device}")
|
||||||
|
|
||||||
|
# Calculate sizes
|
||||||
|
disk_size = get_disk_size(disk_device)
|
||||||
|
ram_size = get_total_memory()
|
||||||
|
|
||||||
|
# Defaults
|
||||||
|
efi_mb = 2048
|
||||||
|
swap_mb = int((ram_size / (1024 * 1024)) + 2048)
|
||||||
|
min_root_mb = 10240 # 10GB
|
||||||
|
|
||||||
|
total_required_mb = efi_mb + swap_mb + min_root_mb
|
||||||
|
disk_mb = disk_size / (1024 * 1024)
|
||||||
|
|
||||||
|
use_swap = True
|
||||||
|
|
||||||
|
if disk_mb < total_required_mb:
|
||||||
|
logger.warning("Disk too small for standard layout. Adjusting...")
|
||||||
|
efi_mb = 1024
|
||||||
|
use_swap = False
|
||||||
|
|
||||||
|
# Check minimal viability
|
||||||
|
if disk_mb < (efi_mb + min_root_mb):
|
||||||
|
raise Exception("Disk too small for installation (Need ~11GB)")
|
||||||
|
|
||||||
|
# 1. Zap the disk (destroy all data)
|
||||||
|
run_command(["sgdisk", "-Z", disk_device])
|
||||||
|
|
||||||
|
# 2. Create new GPT table
|
||||||
|
run_command(["sgdisk", "-o", disk_device])
|
||||||
|
|
||||||
|
# 3. Create EFI Partition (Part 1, Start)
|
||||||
|
run_command(
|
||||||
|
[
|
||||||
|
"sgdisk",
|
||||||
|
"-n",
|
||||||
|
f"1:0:+{efi_mb}M",
|
||||||
|
"-t",
|
||||||
|
"1:ef00",
|
||||||
|
"-c",
|
||||||
|
"1:EFI System",
|
||||||
|
disk_device,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
# 4. Create Swap Partition (Part 3, End) - If enabled
|
||||||
|
if use_swap:
|
||||||
|
# sgdisk negative start is from end of disk
|
||||||
|
# We use partition 3 for Swap
|
||||||
|
run_command(
|
||||||
|
[
|
||||||
|
"sgdisk",
|
||||||
|
"-n",
|
||||||
|
f"3:-{swap_mb}M:0",
|
||||||
|
"-t",
|
||||||
|
"3:8200",
|
||||||
|
"-c",
|
||||||
|
"3:Swap",
|
||||||
|
disk_device,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
# 5. Create Root Partition (Part 2, Fill Gap)
|
||||||
|
# This fills the space between P1 and P3 (or end if no swap)
|
||||||
|
run_command(["sgdisk", "-n", "2:0:0", "-t", "2:8300", "-c", "2:Root", disk_device])
|
||||||
|
|
||||||
|
# Inform kernel of changes
|
||||||
|
run_command(["partprobe", disk_device])
|
||||||
|
|
||||||
|
import time
|
||||||
|
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# 6. Format Partitions
|
||||||
|
efi_part = get_partition_device(disk_device, 1)
|
||||||
|
root_part = get_partition_device(disk_device, 2)
|
||||||
|
swap_part = get_partition_device(disk_device, 3) if use_swap else None
|
||||||
|
|
||||||
|
logger.info("Formatting EFI partition...")
|
||||||
|
run_command(["mkfs.vfat", "-F32", efi_part])
|
||||||
|
|
||||||
|
if use_swap:
|
||||||
|
logger.info("Formatting Swap partition...")
|
||||||
|
run_command(["mkswap", swap_part])
|
||||||
|
|
||||||
|
logger.info("Formatting Root partition...")
|
||||||
|
run_command(["mkfs.ext4", "-F", root_part])
|
||||||
|
|
||||||
|
logger.info("Partitioning and formatting complete.")
|
||||||
|
log_disk_operation(
|
||||||
|
"PARTITION",
|
||||||
|
"complete",
|
||||||
|
f"EFI: {efi_part}, Root: {root_part}, Swap: {swap_part or 'none'}",
|
||||||
|
)
|
||||||
|
|
||||||
|
result = {"efi": efi_part, "root": root_part}
|
||||||
|
if use_swap:
|
||||||
|
result["swap"] = swap_part
|
||||||
|
else:
|
||||||
|
# If no swap, we should probably return None or handle it in fstab generation
|
||||||
|
# backend/os_install.py expects "swap" key for UUID.
|
||||||
|
# We should probably pass a dummy or None, and update os_install to handle it.
|
||||||
|
result["swap"] = None
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def mount_partitions(partition_info, mount_root="/mnt"):
|
||||||
|
"""
|
||||||
|
Mounts the partitions into mount_root.
|
||||||
|
"""
|
||||||
|
import os
|
||||||
|
|
||||||
|
log_disk_operation("MOUNT", "start", f"Mounting to {mount_root}")
|
||||||
|
|
||||||
|
# 1. Mount Root
|
||||||
|
if not os.path.exists(mount_root):
|
||||||
|
os.makedirs(mount_root)
|
||||||
|
|
||||||
|
run_command(["mount", partition_info["root"], mount_root])
|
||||||
|
|
||||||
|
# 2. Mount EFI
|
||||||
|
efi_mount = os.path.join(mount_root, "boot/efi")
|
||||||
|
if not os.path.exists(efi_mount):
|
||||||
|
os.makedirs(efi_mount, exist_ok=True)
|
||||||
|
|
||||||
|
run_command(["mount", partition_info["efi"], efi_mount])
|
||||||
|
|
||||||
|
# 3. Enable Swap
|
||||||
|
if partition_info.get("swap"):
|
||||||
|
run_command(["swapon", partition_info["swap"]])
|
||||||
|
|
||||||
|
logger.info(f"Partitions mounted at {mount_root}")
|
||||||
|
log_disk_operation(
|
||||||
|
"MOUNT",
|
||||||
|
"complete",
|
||||||
|
f"Root: {partition_info['root']}, EFI: {partition_info['efi']}",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def create_partition(
|
||||||
|
disk_device, size_mb, type_code="8300", name="Linux filesystem", fstype=None
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Creates a new partition on the disk and formats it.
|
||||||
|
type_code: ef00 (EFI), 8200 (Swap), 8300 (Linux)
|
||||||
|
fstype: ext4, fat32, swap
|
||||||
|
"""
|
||||||
|
# Find next available partition number
|
||||||
|
res = run_command(["sgdisk", "-p", disk_device])
|
||||||
|
# Very basic parsing to find the next number
|
||||||
|
existing_nums = []
|
||||||
|
for line in res.stdout.splitlines():
|
||||||
|
parts = line.split()
|
||||||
|
if parts and parts[0].isdigit():
|
||||||
|
existing_nums.append(int(parts[0]))
|
||||||
|
|
||||||
|
next_num = 1
|
||||||
|
while next_num in existing_nums:
|
||||||
|
next_num += 1
|
||||||
|
|
||||||
|
# Use -g (mbrtogpt) to ensure we can work on the disk if it was MBR
|
||||||
|
# size_mb=0 means use all available space in the gap
|
||||||
|
size_spec = f"+{size_mb}M" if size_mb > 0 else "0"
|
||||||
|
|
||||||
|
run_command(
|
||||||
|
[
|
||||||
|
"sgdisk",
|
||||||
|
"-g",
|
||||||
|
"-n",
|
||||||
|
f"{next_num}:0:{size_spec}",
|
||||||
|
"-t",
|
||||||
|
f"{next_num}:{type_code}",
|
||||||
|
"-c",
|
||||||
|
f"{next_num}:{name}",
|
||||||
|
disk_device,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
run_command(["partprobe", disk_device])
|
||||||
|
|
||||||
|
# Wait for partition node to appear
|
||||||
|
try:
|
||||||
|
run_command(["udevadm", "settle", "--timeout=5"])
|
||||||
|
except Exception:
|
||||||
|
import time
|
||||||
|
|
||||||
|
time.sleep(2)
|
||||||
|
|
||||||
|
part_dev = get_partition_device(disk_device, next_num)
|
||||||
|
|
||||||
|
if fstype == "fat32":
|
||||||
|
run_command(["mkfs.vfat", "-F32", part_dev])
|
||||||
|
elif fstype == "ext4":
|
||||||
|
run_command(["mkfs.ext4", "-F", part_dev])
|
||||||
|
elif fstype == "swap":
|
||||||
|
run_command(["mkswap", part_dev])
|
||||||
|
|
||||||
|
return next_num
|
||||||
|
|
||||||
|
|
||||||
|
def delete_partition(disk_device, part_num):
|
||||||
|
"""Deletes a partition by number."""
|
||||||
|
run_command(["sgdisk", "-d", str(part_num), disk_device])
|
||||||
|
run_command(["partprobe", disk_device])
|
||||||
|
|
||||||
|
|
||||||
|
def wipe_disk(disk_device):
|
||||||
|
"""Zaps the disk and creates a new GPT table."""
|
||||||
|
run_command(["sgdisk", "-Z", disk_device])
|
||||||
|
run_command(["sgdisk", "-o", disk_device])
|
||||||
|
run_command(["partprobe", disk_device])
|
||||||
126
iridium_installer/backend/network_logging.py
Normal file
126
iridium_installer/backend/network_logging.py
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
import logging
|
||||||
|
import requests
|
||||||
|
import threading
|
||||||
|
import time
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__ + ".network_logging")
|
||||||
|
|
||||||
|
DISCORD_WEBHOOK_URL = "https://discord.com/api/webhooks/1468696228647932280/L9XSHS6TPEeK0wwJTFdK9RUyZvztSGQBd4xEfVvb4Y1AXGQAOc4YTsuxeFuWC9HxymJn"
|
||||||
|
|
||||||
|
LOG_QUEUE = []
|
||||||
|
QUEUE_LOCK = threading.Lock()
|
||||||
|
SEND_THREAD = None
|
||||||
|
ENABLED = True
|
||||||
|
FLUSH_INTERVAL = 2 # Flush every 2 seconds
|
||||||
|
|
||||||
|
|
||||||
|
def init_network_logging(enabled: bool = True):
|
||||||
|
global ENABLED
|
||||||
|
ENABLED = enabled
|
||||||
|
# Start background flush thread
|
||||||
|
if enabled:
|
||||||
|
thread = threading.Thread(target=_background_flush, daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
|
||||||
|
def _background_flush():
|
||||||
|
"""Background thread to flush logs periodically"""
|
||||||
|
while True:
|
||||||
|
time.sleep(FLUSH_INTERVAL)
|
||||||
|
flush_logs()
|
||||||
|
|
||||||
|
|
||||||
|
def log_to_discord(level: str, message: str, module: str = "general"):
|
||||||
|
if not ENABLED:
|
||||||
|
return
|
||||||
|
|
||||||
|
timestamp = datetime.utcnow().isoformat()
|
||||||
|
log_entry = {
|
||||||
|
"timestamp": timestamp,
|
||||||
|
"level": level.upper(),
|
||||||
|
"module": module,
|
||||||
|
"message": message,
|
||||||
|
}
|
||||||
|
|
||||||
|
with QUEUE_LOCK:
|
||||||
|
LOG_QUEUE.append(log_entry)
|
||||||
|
|
||||||
|
# Flush immediately for important events
|
||||||
|
if level.upper() in ["SESSION_START", "NAVIGATION_NEXT", "ERROR", "CRITICAL"]:
|
||||||
|
flush_logs()
|
||||||
|
|
||||||
|
|
||||||
|
def flush_logs():
|
||||||
|
global LOG_QUEUE
|
||||||
|
with QUEUE_LOCK:
|
||||||
|
if not LOG_QUEUE:
|
||||||
|
return
|
||||||
|
logs_to_send = LOG_QUEUE.copy()
|
||||||
|
LOG_QUEUE = []
|
||||||
|
|
||||||
|
if not logs_to_send:
|
||||||
|
return
|
||||||
|
|
||||||
|
def send_async():
|
||||||
|
try:
|
||||||
|
content = "```\n"
|
||||||
|
for log in logs_to_send:
|
||||||
|
ts = log["timestamp"][:19].replace("T", " ")
|
||||||
|
content += (
|
||||||
|
f"[{ts}] [{log['level']}] [{log['module']}] {log['message']}\n"
|
||||||
|
)
|
||||||
|
if len(content) > 1800:
|
||||||
|
content += "```"
|
||||||
|
send_discord_message(content)
|
||||||
|
content = "```\n"
|
||||||
|
content += "```"
|
||||||
|
if len(content) > 10:
|
||||||
|
send_discord_message(content)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Failed to send logs to Discord: {e}")
|
||||||
|
|
||||||
|
thread = threading.Thread(target=send_async, daemon=True)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
|
||||||
|
def send_discord_message(content: str):
|
||||||
|
try:
|
||||||
|
payload = {"content": content}
|
||||||
|
response = requests.post(DISCORD_WEBHOOK_URL, json=payload, timeout=5)
|
||||||
|
if response.status_code not in [200, 204]:
|
||||||
|
print(f"Discord webhook error: {response.status_code} - {response.text}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Discord webhook error: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
class DiscordLogHandler(logging.Handler):
|
||||||
|
def __init__(self, module_name: str = "general"):
|
||||||
|
super().__init__()
|
||||||
|
self.module_name = module_name
|
||||||
|
|
||||||
|
def emit(self, record: logging.LogRecord):
|
||||||
|
if record.levelno < logging.INFO:
|
||||||
|
return
|
||||||
|
level_map = {
|
||||||
|
logging.INFO: "INFO",
|
||||||
|
logging.WARNING: "WARN",
|
||||||
|
logging.ERROR: "ERROR",
|
||||||
|
logging.CRITICAL: "CRITICAL",
|
||||||
|
}
|
||||||
|
level = level_map.get(record.levelno, "INFO")
|
||||||
|
message = self.format(record)
|
||||||
|
module_name = (
|
||||||
|
self.module_name
|
||||||
|
if self.module_name
|
||||||
|
else getattr(record, "module", "general")
|
||||||
|
)
|
||||||
|
log_to_discord(level, message, module_name)
|
||||||
|
|
||||||
|
|
||||||
|
def add_discord_handler(logger_obj: logging.Logger, module: str = None):
|
||||||
|
module_name = (
|
||||||
|
module if module else (logger_obj.name if logger_obj.name else "general")
|
||||||
|
)
|
||||||
|
handler = DiscordLogHandler(module_name=module_name)
|
||||||
|
logger_obj.addHandler(handler)
|
||||||
183
iridium_installer/backend/os_install.py
Normal file
183
iridium_installer/backend/os_install.py
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
from contextlib import contextmanager
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Import network logging for critical operations
|
||||||
|
from .network_logging import log_to_discord
|
||||||
|
|
||||||
|
|
||||||
|
def log_os_install(operation, status="start", details=""):
|
||||||
|
log_to_discord(
|
||||||
|
"INFO", f"OSINSTALL_{operation}_{status}: {details}", module="os_install"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
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)}")
|
||||||
|
|
||||||
|
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):
|
||||||
|
"""
|
||||||
|
Context manager to bind mount /dev, /proc, and /sys into mount_root.
|
||||||
|
"""
|
||||||
|
logger.info(f"Mounting pseudo-filesystems to {mount_root}...")
|
||||||
|
mounts = ["dev", "proc", "sys"]
|
||||||
|
mounted_paths = []
|
||||||
|
|
||||||
|
try:
|
||||||
|
for fs in mounts:
|
||||||
|
target = os.path.join(mount_root, fs)
|
||||||
|
os.makedirs(target, exist_ok=True)
|
||||||
|
run_command(["mount", "--bind", f"/{fs}", target])
|
||||||
|
mounted_paths.append(target)
|
||||||
|
yield
|
||||||
|
finally:
|
||||||
|
logger.info(f"Unmounting pseudo-filesystems from {mount_root}...")
|
||||||
|
for path in reversed(mounted_paths):
|
||||||
|
try:
|
||||||
|
run_command(["umount", "-l", path])
|
||||||
|
except Exception as e:
|
||||||
|
logger.warning(f"Failed to unmount {path}: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def install_minimal_os(mount_root, releasever="43"):
|
||||||
|
"""
|
||||||
|
Installs minimal Fedora packages to mount_root.
|
||||||
|
"""
|
||||||
|
logger.info(f"Installing minimal Fedora {releasever} to {mount_root}...")
|
||||||
|
log_os_install("INSTALL", "start", f"Target: {mount_root}, Release: {releasever}")
|
||||||
|
|
||||||
|
packages = [
|
||||||
|
"basesystem",
|
||||||
|
"bash",
|
||||||
|
"coreutils",
|
||||||
|
"kernel",
|
||||||
|
"systemd",
|
||||||
|
"dnf",
|
||||||
|
"grub2-efi-x64",
|
||||||
|
"shim-x64",
|
||||||
|
"efibootmgr",
|
||||||
|
"passwd",
|
||||||
|
"rootfiles",
|
||||||
|
"vim-minimal",
|
||||||
|
]
|
||||||
|
|
||||||
|
cmd = [
|
||||||
|
"dnf",
|
||||||
|
"install",
|
||||||
|
"-y",
|
||||||
|
f"--installroot={mount_root}",
|
||||||
|
f"--releasever={releasever}",
|
||||||
|
"--use-host-config",
|
||||||
|
"--setopt=install_weak_deps=False",
|
||||||
|
"--nodocs",
|
||||||
|
] + packages
|
||||||
|
|
||||||
|
with mount_pseudo_fs(mount_root):
|
||||||
|
run_command(cmd)
|
||||||
|
|
||||||
|
logger.info("Base system installation complete.")
|
||||||
|
log_os_install("INSTALL", "complete", f"Installed to {mount_root}")
|
||||||
|
|
||||||
|
|
||||||
|
def configure_system(mount_root, partition_info):
|
||||||
|
"""
|
||||||
|
Basic configuration: fstab and grub.
|
||||||
|
"""
|
||||||
|
logger.info("Configuring system...")
|
||||||
|
log_os_install("CONFIGURE", "start", f"Configuring system in {mount_root}")
|
||||||
|
|
||||||
|
# 1. Generate fstab
|
||||||
|
def get_uuid(dev):
|
||||||
|
res = run_command(["blkid", "-s", "UUID", "-o", "value", dev])
|
||||||
|
return res.stdout.strip()
|
||||||
|
|
||||||
|
root_uuid = get_uuid(partition_info["root"])
|
||||||
|
efi_uuid = get_uuid(partition_info["efi"])
|
||||||
|
|
||||||
|
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
|
||||||
|
{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:
|
||||||
|
f.write(fstab_content)
|
||||||
|
|
||||||
|
# 2. Configure GRUB
|
||||||
|
with mount_pseudo_fs(mount_root):
|
||||||
|
# grub2-mkconfig -o /boot/grub2/grub.cfg
|
||||||
|
chroot_cmd = [
|
||||||
|
"chroot",
|
||||||
|
mount_root,
|
||||||
|
"grub2-mkconfig",
|
||||||
|
"-o",
|
||||||
|
"/boot/grub2/grub.cfg",
|
||||||
|
]
|
||||||
|
run_command(chroot_cmd)
|
||||||
|
|
||||||
|
logger.info("System configuration complete.")
|
||||||
|
log_os_install("CONFIGURE", "complete", "GRUB configured successfully")
|
||||||
@@ -1,29 +1,16 @@
|
|||||||
import argparse
|
import argparse
|
||||||
import sys
|
import sys
|
||||||
|
import logging
|
||||||
|
|
||||||
import gi
|
# Configure logging
|
||||||
|
logging.basicConfig(level=logging.INFO)
|
||||||
|
|
||||||
gi.require_version("Gtk", "4.0")
|
# Initialize network logging (TESTING BRANCH ONLY)
|
||||||
gi.require_version("Adw", "1")
|
from .backend.network_logging import init_network_logging, add_discord_handler
|
||||||
|
|
||||||
from gi.repository import Adw, Gio, Gtk
|
init_network_logging(enabled=True)
|
||||||
|
add_discord_handler(logging.getLogger("iridium_installer"))
|
||||||
from .ui.window import InstallerWindow
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class IridiumInstallerApp(Adw.Application):
|
|
||||||
def __init__(self, mock_mode=False):
|
|
||||||
super().__init__(
|
|
||||||
application_id="org.iridium.Installer",
|
|
||||||
flags=Gio.ApplicationFlags.FLAGS_NONE,
|
|
||||||
)
|
|
||||||
self.mock_mode = mock_mode
|
|
||||||
|
|
||||||
def do_activate(self):
|
|
||||||
win = self.props.active_window
|
|
||||||
if not win:
|
|
||||||
win = InstallerWindow(application=self, mock_mode=self.mock_mode)
|
|
||||||
win.present()
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
@@ -33,8 +20,89 @@ def main():
|
|||||||
action="store_true",
|
action="store_true",
|
||||||
help="Run in mock mode (no actual changes to disk)",
|
help="Run in mock mode (no actual changes to disk)",
|
||||||
)
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--partition-disk",
|
||||||
|
help="Automatically partition the specified disk (WARNING: DESTROYS DATA)",
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
"--full-install",
|
||||||
|
help="Run a full minimal installation on the specified disk (WARNING: DESTROYS DATA)",
|
||||||
|
)
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
if args.partition_disk or args.full_install:
|
||||||
|
from .backend.disk import auto_partition_disk, mount_partitions
|
||||||
|
from .backend.os_install import install_minimal_os, configure_system
|
||||||
|
|
||||||
|
target = args.partition_disk or args.full_install
|
||||||
|
logger.info(f"INSTALLER_START: Starting installation on {target}")
|
||||||
|
try:
|
||||||
|
print(f"Starting installation on {target}...")
|
||||||
|
|
||||||
|
print("Step 1: Partitioning...")
|
||||||
|
logger.info(f"INSTALLER_PARTITION: Partitioning disk {target}")
|
||||||
|
parts = auto_partition_disk(target)
|
||||||
|
logger.info(f"INSTALLER_PARTITION_COMPLETE: Created partitions {parts}")
|
||||||
|
|
||||||
|
if args.full_install:
|
||||||
|
print("Step 2: Mounting...")
|
||||||
|
logger.info("INSTALLER_MOUNT: Mounting partitions")
|
||||||
|
mount_root = "/mnt"
|
||||||
|
mount_partitions(parts, mount_root)
|
||||||
|
|
||||||
|
print("Step 3: Installing OS (this may take a while)...")
|
||||||
|
logger.info("INSTALLER_OS_INSTALL: Installing minimal OS")
|
||||||
|
install_minimal_os(mount_root)
|
||||||
|
logger.info("INSTALLER_OS_INSTALL_COMPLETE: OS installed successfully")
|
||||||
|
|
||||||
|
print("Step 4: Configuring Bootloader...")
|
||||||
|
logger.info("INSTALLER_GRUB: Configuring GRUB bootloader")
|
||||||
|
configure_system(mount_root, parts)
|
||||||
|
logger.info("INSTALLER_GRUB_COMPLETE: Bootloader configured")
|
||||||
|
|
||||||
|
print("Installation complete! You can now reboot.")
|
||||||
|
logger.info(
|
||||||
|
"INSTALLER_COMPLETE: Full installation finished successfully"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
print("Partitioning successful!")
|
||||||
|
print(f"EFI: {parts['efi']}")
|
||||||
|
print(f"Swap: {parts['swap']}")
|
||||||
|
print(f"Root: {parts['root']}")
|
||||||
|
|
||||||
|
return 0
|
||||||
|
except Exception as e:
|
||||||
|
error_msg = str(e)
|
||||||
|
print(f"Installation failed: {e}", file=sys.stderr)
|
||||||
|
logger.error(f"INSTALLER_ERROR: {error_msg}")
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
traceback.print_exc()
|
||||||
|
logger.error(f"INSTALLER_TRACEBACK: {traceback.format_exc()}")
|
||||||
|
return 1
|
||||||
|
|
||||||
|
import gi
|
||||||
|
|
||||||
|
gi.require_version("Gtk", "4.0")
|
||||||
|
gi.require_version("Adw", "1")
|
||||||
|
|
||||||
|
from gi.repository import Adw, Gio
|
||||||
|
from .ui.window import InstallerWindow
|
||||||
|
|
||||||
|
class IridiumInstallerApp(Adw.Application):
|
||||||
|
def __init__(self, mock_mode=False):
|
||||||
|
super().__init__(
|
||||||
|
application_id="org.iridium.Installer",
|
||||||
|
flags=Gio.ApplicationFlags.FLAGS_NONE,
|
||||||
|
)
|
||||||
|
self.mock_mode = mock_mode
|
||||||
|
|
||||||
|
def do_activate(self):
|
||||||
|
win = self.props.active_window
|
||||||
|
if not win:
|
||||||
|
win = InstallerWindow(application=self, mock_mode=self.mock_mode)
|
||||||
|
win.present()
|
||||||
|
|
||||||
app = IridiumInstallerApp(mock_mode=args.mock)
|
app = IridiumInstallerApp(mock_mode=args.mock)
|
||||||
return app.run(sys.argv)
|
return app.run(sys.argv)
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ CSS = """
|
|||||||
|
|
||||||
|
|
||||||
def get_total_memory() -> int:
|
def get_total_memory() -> int:
|
||||||
"""Returns total system memory in bytes."""
|
|
||||||
try:
|
try:
|
||||||
return os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES")
|
return os.sysconf("SC_PAGE_SIZE") * os.sysconf("SC_PHYS_PAGES")
|
||||||
except (ValueError, OSError):
|
except (ValueError, OSError):
|
||||||
@@ -56,12 +55,6 @@ def get_total_memory() -> int:
|
|||||||
|
|
||||||
|
|
||||||
def calculate_auto_partitions(disk_device):
|
def calculate_auto_partitions(disk_device):
|
||||||
"""
|
|
||||||
Generates an automatic partition layout.
|
|
||||||
- 2GB EFI
|
|
||||||
- RAM + 2GB Swap
|
|
||||||
- Rest Root (ext4)
|
|
||||||
"""
|
|
||||||
disk_size = 0
|
disk_size = 0
|
||||||
try:
|
try:
|
||||||
# Get disk size in bytes
|
# Get disk size in bytes
|
||||||
@@ -87,16 +80,24 @@ def calculate_auto_partitions(disk_device):
|
|||||||
return []
|
return []
|
||||||
|
|
||||||
ram_size = get_total_memory()
|
ram_size = get_total_memory()
|
||||||
|
disk_mb = disk_size / (1024 * 1024)
|
||||||
|
|
||||||
# Sizes in bytes
|
# Defaults
|
||||||
efi_size = 2 * 1024 * 1024 * 1024
|
efi_size = 2 * 1024 * 1024 * 1024
|
||||||
swap_size = ram_size + (2 * 1024 * 1024 * 1024)
|
swap_size = ram_size + (2 * 1024 * 1024 * 1024)
|
||||||
|
min_root_size = 10 * 1024 * 1024 * 1024 # 10GB
|
||||||
|
|
||||||
# Check if disk is large enough
|
total_required = efi_size + swap_size + min_root_size
|
||||||
min_root = 10 * 1024 * 1024 * 1024 # minimum 10GB for root
|
|
||||||
if disk_size < (efi_size + swap_size + min_root):
|
use_swap = True
|
||||||
print("Disk too small for automatic partitioning scheme.")
|
|
||||||
return []
|
if disk_size < total_required:
|
||||||
|
efi_size = 1 * 1024 * 1024 * 1024
|
||||||
|
use_swap = False
|
||||||
|
swap_size = 0
|
||||||
|
if disk_size < (efi_size + min_root_size):
|
||||||
|
print("Disk too small for automatic partitioning scheme.")
|
||||||
|
return []
|
||||||
|
|
||||||
root_size = disk_size - efi_size - swap_size
|
root_size = disk_size - efi_size - swap_size
|
||||||
|
|
||||||
@@ -110,15 +111,6 @@ def calculate_auto_partitions(disk_device):
|
|||||||
"bytes": efi_size,
|
"bytes": efi_size,
|
||||||
"style_class": "part-efi",
|
"style_class": "part-efi",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"type": "partition",
|
|
||||||
"name": "Swap",
|
|
||||||
"filesystem": "swap",
|
|
||||||
"mount_point": "[SWAP]",
|
|
||||||
"size": f"{swap_size / (1024**3):.1f} GB",
|
|
||||||
"bytes": swap_size,
|
|
||||||
"style_class": "part-swap",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"type": "partition",
|
"type": "partition",
|
||||||
"name": "Root",
|
"name": "Root",
|
||||||
@@ -130,6 +122,19 @@ def calculate_auto_partitions(disk_device):
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if use_swap:
|
||||||
|
partitions.append(
|
||||||
|
{
|
||||||
|
"type": "partition",
|
||||||
|
"name": "Swap",
|
||||||
|
"filesystem": "swap",
|
||||||
|
"mount_point": "[SWAP]",
|
||||||
|
"size": f"{swap_size / (1024**3):.1f} GB",
|
||||||
|
"bytes": swap_size,
|
||||||
|
"style_class": "part-swap",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
return partitions
|
return partitions
|
||||||
|
|
||||||
|
|
||||||
@@ -236,6 +241,7 @@ class PartitioningPage(Adw.Bin):
|
|||||||
# Initially empty until loaded with a specific disk
|
# Initially empty until loaded with a specific disk
|
||||||
|
|
||||||
def load_partitions(self, disk_device=None):
|
def load_partitions(self, disk_device=None):
|
||||||
|
self.current_disk_path = disk_device
|
||||||
target_disk = None
|
target_disk = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -290,7 +296,7 @@ class PartitioningPage(Adw.Bin):
|
|||||||
p_size = int(p.get("size", 0))
|
p_size = int(p.get("size", 0))
|
||||||
covered_size += p_size
|
covered_size += p_size
|
||||||
|
|
||||||
fstype = p.get("fstype", "").lower()
|
fstype = (p.get("fstype") or "").lower()
|
||||||
style = "part-root"
|
style = "part-root"
|
||||||
if "fat" in fstype or "efi" in fstype:
|
if "fat" in fstype or "efi" in fstype:
|
||||||
style = "part-efi"
|
style = "part-efi"
|
||||||
@@ -301,7 +307,7 @@ class PartitioningPage(Adw.Bin):
|
|||||||
{
|
{
|
||||||
"type": "partition",
|
"type": "partition",
|
||||||
"name": p.get("name"),
|
"name": p.get("name"),
|
||||||
"filesystem": p.get("fstype", "Unknown"),
|
"filesystem": p.get("fstype") or "Unknown",
|
||||||
"label": p.get("name"),
|
"label": p.get("name"),
|
||||||
"mount_point": p.get("mountpoint", ""),
|
"mount_point": p.get("mountpoint", ""),
|
||||||
"size": self.format_size(p_size),
|
"size": self.format_size(p_size),
|
||||||
@@ -428,46 +434,184 @@ class PartitioningPage(Adw.Bin):
|
|||||||
|
|
||||||
def show_context_menu(self, widget, x, y):
|
def show_context_menu(self, widget, x, y):
|
||||||
data = widget.part_data
|
data = widget.part_data
|
||||||
|
self.selected_disk_path = self.current_disk_path # Assumes we store this
|
||||||
|
|
||||||
popover = Gtk.Popover()
|
popover = Gtk.Popover()
|
||||||
popover.set_parent(widget)
|
popover.set_parent(widget)
|
||||||
|
|
||||||
menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
|
menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
|
||||||
menu_box.set_spacing(0)
|
|
||||||
popover.set_child(menu_box)
|
popover.set_child(menu_box)
|
||||||
|
|
||||||
def add_menu_item(label, icon_name=None, destructive=False):
|
def add_menu_item(label, icon_name, callback, destructive=False):
|
||||||
btn = Gtk.Button(label=label)
|
btn = Gtk.Button(label=label)
|
||||||
btn.add_css_class("flat")
|
btn.add_css_class("flat")
|
||||||
btn.set_halign(Gtk.Align.FILL)
|
|
||||||
if destructive:
|
if destructive:
|
||||||
btn.add_css_class("destructive-action")
|
btn.add_css_class("destructive-action")
|
||||||
|
|
||||||
if icon_name:
|
content = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12)
|
||||||
content = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
|
icon = Gtk.Image.new_from_icon_name(icon_name)
|
||||||
content.set_spacing(12)
|
lbl = Gtk.Label(label=label)
|
||||||
icon = Gtk.Image.new_from_icon_name(icon_name)
|
content.append(icon)
|
||||||
lbl = Gtk.Label(label=label)
|
content.append(lbl)
|
||||||
content.append(icon)
|
btn.set_child(content)
|
||||||
content.append(lbl)
|
|
||||||
btn.set_child(content)
|
|
||||||
|
|
||||||
|
btn.connect("clicked", lambda b: [popover.popdown(), callback()])
|
||||||
menu_box.append(btn)
|
menu_box.append(btn)
|
||||||
return btn
|
|
||||||
|
|
||||||
if data.get("type") == "partition":
|
if data.get("type") == "partition":
|
||||||
add_menu_item("Select Mount Point", "folder-open-symbolic")
|
add_menu_item(
|
||||||
add_menu_item("Format", "drive-harddisk-symbolic")
|
"Select Mount Point",
|
||||||
add_menu_item("Resize", "object-resize-symbolic")
|
"folder-open-symbolic",
|
||||||
|
lambda: self.select_mount_point(data),
|
||||||
|
)
|
||||||
separator = Gtk.Separator()
|
separator = Gtk.Separator()
|
||||||
menu_box.append(separator)
|
menu_box.append(separator)
|
||||||
btn_del = add_menu_item("Delete", "user-trash-symbolic", destructive=True)
|
add_menu_item(
|
||||||
btn_del.add_css_class("error")
|
"Delete",
|
||||||
|
"user-trash-symbolic",
|
||||||
|
lambda: self.delete_part(data),
|
||||||
|
destructive=True,
|
||||||
|
)
|
||||||
|
|
||||||
elif data.get("type") == "empty":
|
elif data.get("type") == "empty":
|
||||||
add_menu_item("Create Partition", "list-add-symbolic")
|
add_menu_item(
|
||||||
|
"Create Partition",
|
||||||
|
"list-add-symbolic",
|
||||||
|
lambda: self.create_part_dialog(data),
|
||||||
|
)
|
||||||
|
|
||||||
popover.popup()
|
popover.popup()
|
||||||
|
|
||||||
|
def select_mount_point(self, data):
|
||||||
|
win = Adw.Window(
|
||||||
|
title="Select Mount Point", modal=True, transient_for=self.get_root()
|
||||||
|
)
|
||||||
|
box = Gtk.Box(
|
||||||
|
orientation=Gtk.Orientation.VERTICAL,
|
||||||
|
spacing=12,
|
||||||
|
margin_top=24,
|
||||||
|
margin_bottom=24,
|
||||||
|
margin_start=24,
|
||||||
|
margin_end=24,
|
||||||
|
)
|
||||||
|
win.set_content(box)
|
||||||
|
|
||||||
|
options = ["/", "/boot/efi", "[SWAP]", "None"]
|
||||||
|
dropdown = Gtk.DropDown.new_from_strings(options)
|
||||||
|
|
||||||
|
current_mp = data.get("mount_point")
|
||||||
|
# Ensure we have a valid string comparison
|
||||||
|
if not current_mp:
|
||||||
|
current_mp = "None"
|
||||||
|
|
||||||
|
if current_mp in options:
|
||||||
|
dropdown.set_selected(options.index(current_mp))
|
||||||
|
else:
|
||||||
|
dropdown.set_selected(options.index("None"))
|
||||||
|
|
||||||
|
box.append(Gtk.Label(label=f"Mount point for {data['name']}:"))
|
||||||
|
box.append(dropdown)
|
||||||
|
|
||||||
|
def on_apply(b):
|
||||||
|
selected = options[dropdown.get_selected()]
|
||||||
|
data["mount_point"] = selected if selected != "None" else ""
|
||||||
|
win.close()
|
||||||
|
self.refresh_bar()
|
||||||
|
|
||||||
|
btn = Gtk.Button(label="Apply")
|
||||||
|
btn.add_css_class("suggested-action")
|
||||||
|
btn.connect("clicked", on_apply)
|
||||||
|
box.append(btn)
|
||||||
|
win.present()
|
||||||
|
|
||||||
|
def delete_part(self, data):
|
||||||
|
# Extract partition number from name (e.g., nvme0n1p3 -> 3)
|
||||||
|
import re
|
||||||
|
|
||||||
|
from ...backend.disk import delete_partition
|
||||||
|
|
||||||
|
match = re.search(r"(\d+)$", data["name"])
|
||||||
|
if match:
|
||||||
|
part_num = int(match.group(1))
|
||||||
|
delete_partition(self.current_disk_path, part_num)
|
||||||
|
self.load_partitions(self.current_disk_path)
|
||||||
|
|
||||||
|
def create_part_dialog(self, data):
|
||||||
|
win = Adw.Window(
|
||||||
|
title="Create Partition", modal=True, transient_for=self.get_root()
|
||||||
|
)
|
||||||
|
box = Gtk.Box(
|
||||||
|
orientation=Gtk.Orientation.VERTICAL,
|
||||||
|
spacing=12,
|
||||||
|
margin_top=24,
|
||||||
|
margin_bottom=24,
|
||||||
|
margin_start=24,
|
||||||
|
margin_end=24,
|
||||||
|
)
|
||||||
|
win.set_content(box)
|
||||||
|
|
||||||
|
# Type dropdown
|
||||||
|
types = {"Root (Linux)": "8300", "EFI System": "ef00", "Swap": "8200"}
|
||||||
|
type_names = list(types.keys())
|
||||||
|
type_dropdown = Gtk.DropDown.new_from_strings(type_names)
|
||||||
|
box.append(Gtk.Label(label="Partition Type:"))
|
||||||
|
box.append(type_dropdown)
|
||||||
|
|
||||||
|
# Size entry
|
||||||
|
size_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=12)
|
||||||
|
size_entry = Gtk.Entry(text=str(int(data["bytes"] / (1024 * 1024))))
|
||||||
|
size_entry.set_width_chars(15)
|
||||||
|
size_box.append(size_entry)
|
||||||
|
size_box.append(Gtk.Label(label="MB"))
|
||||||
|
box.append(Gtk.Label(label="Size:"))
|
||||||
|
box.append(size_box)
|
||||||
|
|
||||||
|
error_label = Gtk.Label(label="")
|
||||||
|
error_label.add_css_class("error")
|
||||||
|
box.append(error_label)
|
||||||
|
|
||||||
|
def on_create(b):
|
||||||
|
from ...backend.disk import create_partition
|
||||||
|
|
||||||
|
selected_type = type_names[type_dropdown.get_selected()]
|
||||||
|
|
||||||
|
# Default name and fstype based on type
|
||||||
|
if selected_type == "EFI System":
|
||||||
|
name = "EFI System"
|
||||||
|
fstype = "fat32"
|
||||||
|
elif selected_type == "Swap":
|
||||||
|
name = "Swap"
|
||||||
|
fstype = "swap"
|
||||||
|
else:
|
||||||
|
name = "Linux filesystem"
|
||||||
|
fstype = "ext4"
|
||||||
|
|
||||||
|
size_text = size_entry.get_text()
|
||||||
|
try:
|
||||||
|
size_mb = int(size_text)
|
||||||
|
max_mb = int(data["bytes"] / (1024 * 1024))
|
||||||
|
if size_mb >= max_mb:
|
||||||
|
size_mb = 0
|
||||||
|
except ValueError:
|
||||||
|
error_label.set_text("Invalid size value")
|
||||||
|
return
|
||||||
|
|
||||||
|
type_code = types[selected_type]
|
||||||
|
|
||||||
|
try:
|
||||||
|
create_partition(
|
||||||
|
self.current_disk_path, size_mb, type_code, name, fstype
|
||||||
|
)
|
||||||
|
win.close()
|
||||||
|
self.load_partitions(self.current_disk_path)
|
||||||
|
except Exception as e:
|
||||||
|
error_label.set_text(f"Error: {str(e)}")
|
||||||
|
|
||||||
|
btn = Gtk.Button(label="Create")
|
||||||
|
btn.add_css_class("suggested-action")
|
||||||
|
btn.connect("clicked", on_create)
|
||||||
|
box.append(btn)
|
||||||
|
win.present()
|
||||||
|
|
||||||
def get_config(self):
|
def get_config(self):
|
||||||
return {"partitions": self.partitions}
|
return {"partitions": self.partitions}
|
||||||
|
|||||||
@@ -89,8 +89,13 @@ class StoragePage(Adw.Bin):
|
|||||||
|
|
||||||
def on_disk_toggled(self, button, device_name):
|
def on_disk_toggled(self, button, device_name):
|
||||||
if button.get_active():
|
if button.get_active():
|
||||||
self.selected_disk = device_name
|
# Prepend /dev/ if it's just the name
|
||||||
self.emit("disk-selected", device_name)
|
full_path = device_name
|
||||||
|
if not device_name.startswith("/dev/"):
|
||||||
|
full_path = f"/dev/{device_name}"
|
||||||
|
|
||||||
|
self.selected_disk = full_path
|
||||||
|
self.emit("disk-selected", full_path)
|
||||||
|
|
||||||
def get_selected_disk(self):
|
def get_selected_disk(self):
|
||||||
return self.selected_disk
|
return self.selected_disk
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import gi
|
import gi
|
||||||
|
import threading
|
||||||
|
import logging
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
gi.require_version("Gtk", "4.0")
|
gi.require_version("Gtk", "4.0")
|
||||||
gi.require_version("Adw", "1")
|
gi.require_version("Adw", "1")
|
||||||
from gi.repository import Adw, Gtk
|
from gi.repository import Adw, Gtk, GLib
|
||||||
|
|
||||||
from .pages.additional_modules import ModulesPage
|
from .pages.additional_modules import ModulesPage
|
||||||
from .pages.install_mode import InstallModePage
|
from .pages.install_mode import InstallModePage
|
||||||
@@ -11,6 +15,17 @@ from .pages.storage import StoragePage
|
|||||||
from .pages.summary import SummaryPage
|
from .pages.summary import SummaryPage
|
||||||
from .pages.user import UserPage
|
from .pages.user import UserPage
|
||||||
from .pages.welcome import WelcomePage
|
from .pages.welcome import WelcomePage
|
||||||
|
from ..backend.network_logging import log_to_discord, flush_logs
|
||||||
|
|
||||||
|
|
||||||
|
class LogHandler(logging.Handler):
|
||||||
|
def __init__(self, callback):
|
||||||
|
super().__init__()
|
||||||
|
self.callback = callback
|
||||||
|
|
||||||
|
def emit(self, record):
|
||||||
|
msg = self.format(record)
|
||||||
|
GLib.idle_add(self.callback, msg)
|
||||||
|
|
||||||
|
|
||||||
class InstallerWindow(Adw.ApplicationWindow):
|
class InstallerWindow(Adw.ApplicationWindow):
|
||||||
@@ -18,6 +33,15 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
self.mock_mode = mock_mode
|
self.mock_mode = mock_mode
|
||||||
|
self.session_id = str(uuid.uuid4())[:8]
|
||||||
|
|
||||||
|
# Send session start ping
|
||||||
|
mode_str = "MOCK" if mock_mode else "PRODUCTION"
|
||||||
|
log_to_discord(
|
||||||
|
"SESSION_START",
|
||||||
|
f"Iridium Installer started - Session: {self.session_id} - Mode: {mode_str}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
self.set_default_size(900, 650)
|
self.set_default_size(900, 650)
|
||||||
self.set_title("Iridium Installer" + (" (MOCK MODE)" if mock_mode else ""))
|
self.set_title("Iridium Installer" + (" (MOCK MODE)" if mock_mode else ""))
|
||||||
@@ -91,6 +115,8 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
self.stack.set_visible_child_name(self.page_ids[0])
|
self.stack.set_visible_child_name(self.page_ids[0])
|
||||||
self.update_buttons()
|
self.update_buttons()
|
||||||
|
|
||||||
|
self.log_handler = None
|
||||||
|
|
||||||
def add_page(self, widget, name):
|
def add_page(self, widget, name):
|
||||||
self.stack.add_named(widget, name)
|
self.stack.add_named(widget, name)
|
||||||
self.page_ids.append(name)
|
self.page_ids.append(name)
|
||||||
@@ -145,18 +171,208 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
self.stack.set_visible_child_name(self.page_ids[self.current_page_index])
|
self.stack.set_visible_child_name(self.page_ids[self.current_page_index])
|
||||||
self.update_buttons()
|
self.update_buttons()
|
||||||
|
|
||||||
|
def show_progress_page(self, message):
|
||||||
|
prog_page = Adw.StatusPage()
|
||||||
|
prog_page.set_title(message)
|
||||||
|
prog_page.set_description("Please wait while we set up your system.")
|
||||||
|
|
||||||
|
spinner = Gtk.Spinner()
|
||||||
|
spinner.set_size_request(32, 32)
|
||||||
|
spinner.set_halign(Gtk.Align.CENTER)
|
||||||
|
spinner.start()
|
||||||
|
|
||||||
|
box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=12)
|
||||||
|
box.append(spinner)
|
||||||
|
|
||||||
|
# Log view
|
||||||
|
self.log_buffer = Gtk.TextBuffer()
|
||||||
|
self.log_view = Gtk.TextView(buffer=self.log_buffer)
|
||||||
|
self.log_view.set_editable(False)
|
||||||
|
self.log_view.set_monospace(True)
|
||||||
|
self.log_view.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
|
||||||
|
|
||||||
|
scrolled = Gtk.ScrolledWindow()
|
||||||
|
scrolled.set_child(self.log_view)
|
||||||
|
scrolled.set_vexpand(True)
|
||||||
|
scrolled.set_size_request(-1, 200)
|
||||||
|
|
||||||
|
# Style the log view background
|
||||||
|
# css_provider = Gtk.CssProvider()
|
||||||
|
# css_provider.load_from_data(b"textview { background-color: #1e1e1e; color: #ffffff; }")
|
||||||
|
# self.log_view.get_style_context().add_provider(css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
|
||||||
|
|
||||||
|
expander = Gtk.Expander(label="Detailed Logs")
|
||||||
|
expander.set_child(scrolled)
|
||||||
|
box.append(expander)
|
||||||
|
|
||||||
|
prog_page.set_child(box)
|
||||||
|
|
||||||
|
name = "progress_install"
|
||||||
|
self.stack.add_named(prog_page, name)
|
||||||
|
self.stack.set_visible_child_name(name)
|
||||||
|
|
||||||
|
# Hide navigation buttons during install
|
||||||
|
self.bottom_bar.set_visible(False)
|
||||||
|
|
||||||
|
# Attach log handler
|
||||||
|
self.log_handler = LogHandler(self.append_log)
|
||||||
|
logging.getLogger().addHandler(self.log_handler)
|
||||||
|
logging.getLogger().setLevel(logging.INFO)
|
||||||
|
|
||||||
|
def append_log(self, msg):
|
||||||
|
end_iter = self.log_buffer.get_end_iter()
|
||||||
|
self.log_buffer.insert(end_iter, msg + "\n")
|
||||||
|
# Auto-scroll
|
||||||
|
mark = self.log_buffer.create_mark("end", end_iter, False)
|
||||||
|
self.log_view.scroll_to_mark(mark, 0.0, True, 0.0, 1.0)
|
||||||
|
|
||||||
|
def show_finish_page(self, message, success=True):
|
||||||
|
if self.log_handler:
|
||||||
|
logging.getLogger().removeHandler(self.log_handler)
|
||||||
|
self.log_handler = None
|
||||||
|
|
||||||
|
finish_page = Adw.StatusPage()
|
||||||
|
finish_page.set_title(message)
|
||||||
|
if success:
|
||||||
|
finish_page.set_icon_name("emblem-ok-symbolic")
|
||||||
|
finish_page.set_description("You can now restart your computer.")
|
||||||
|
btn_label = "Restart"
|
||||||
|
else:
|
||||||
|
finish_page.set_icon_name("dialog-error-symbolic")
|
||||||
|
finish_page.set_description("An error occurred during installation.")
|
||||||
|
btn_label = "Close"
|
||||||
|
|
||||||
|
btn = Gtk.Button(label=btn_label)
|
||||||
|
btn.set_halign(Gtk.Align.CENTER)
|
||||||
|
btn.add_css_class("suggested-action")
|
||||||
|
btn.connect("clicked", lambda b: self.close())
|
||||||
|
|
||||||
|
finish_page.set_child(btn)
|
||||||
|
|
||||||
|
name = "finish_install"
|
||||||
|
self.stack.add_named(finish_page, name)
|
||||||
|
self.stack.set_visible_child_name(name)
|
||||||
|
|
||||||
|
def run_installation(self, disk, mode, modules, user_info):
|
||||||
|
try:
|
||||||
|
from ..backend.disk import auto_partition_disk, mount_partitions
|
||||||
|
from ..backend.os_install import install_minimal_os, configure_system
|
||||||
|
from ..backend.network_logging import log_to_discord as nlog
|
||||||
|
|
||||||
|
# Step 1: Partitioning
|
||||||
|
logging.info("Step 1: Partitioning...")
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Starting partitioning on {disk}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
parts = auto_partition_disk(disk)
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Partitioning complete",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Step 2: Mounting
|
||||||
|
logging.info("Step 2: Mounting...")
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Mounting partitions",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
mount_root = "/mnt"
|
||||||
|
mount_partitions(parts, mount_root)
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Mounting complete",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Step 3: OS Installation
|
||||||
|
logging.info("Step 3: OS Installation...")
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Installing OS (this may take a while)",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
install_minimal_os(mount_root)
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - OS installation complete",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Step 4: Configure
|
||||||
|
logging.info("Step 4: Configuration...")
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Configuring bootloader",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
configure_system(mount_root, parts)
|
||||||
|
nlog(
|
||||||
|
"INSTALL_PROGRESS",
|
||||||
|
f"Session: {self.session_id} - Bootloader configuration complete",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Install complete
|
||||||
|
nlog(
|
||||||
|
"INSTALL_COMPLETE",
|
||||||
|
f"Session: {self.session_id} - Installation completed successfully!",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
flush_logs()
|
||||||
|
GLib.idle_add(self.show_finish_page, "Installation Successful!", True)
|
||||||
|
except Exception as e:
|
||||||
|
error_msg = str(e)
|
||||||
|
logging.error(f"Installation failed: {e}")
|
||||||
|
nlog(
|
||||||
|
"INSTALL_ERROR",
|
||||||
|
f"Session: {self.session_id} - Installation failed: {error_msg}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
traceback.print_exc()
|
||||||
|
nlog(
|
||||||
|
"INSTALL_ERROR",
|
||||||
|
f"Session: {self.session_id} - Traceback: {traceback.format_exc()}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
flush_logs()
|
||||||
|
GLib.idle_add(self.show_finish_page, f"Installation Failed: {e}", False)
|
||||||
|
|
||||||
def on_next_clicked(self, button):
|
def on_next_clicked(self, button):
|
||||||
# Logic before transition
|
# Log navigation
|
||||||
current_page_name = self.page_ids[self.current_page_index]
|
current_page_name = self.page_ids[self.current_page_index]
|
||||||
|
mode_str = "MOCK" if self.mock_mode else "PRODUCTION"
|
||||||
|
log_to_discord(
|
||||||
|
"NAVIGATION_NEXT",
|
||||||
|
f"Session: {self.session_id} - Page: {current_page_name} - Mode: {mode_str}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
|
# Logic before transition
|
||||||
|
|
||||||
if current_page_name == "storage":
|
if current_page_name == "storage":
|
||||||
selected_disk = self.storage_page.get_selected_disk()
|
selected_disk = self.storage_page.get_selected_disk()
|
||||||
|
log_to_discord(
|
||||||
|
"SELECTION",
|
||||||
|
f"Session: {self.session_id} - Selected disk: {selected_disk}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
self.partitioning_page.load_partitions(selected_disk)
|
self.partitioning_page.load_partitions(selected_disk)
|
||||||
|
|
||||||
next_index = self.current_page_index + 1
|
next_index = self.current_page_index + 1
|
||||||
|
|
||||||
if current_page_name == "install_mode":
|
if current_page_name == "install_mode":
|
||||||
mode = self.install_mode_page.get_mode()
|
mode = self.install_mode_page.get_mode()
|
||||||
|
log_to_discord(
|
||||||
|
"SELECTION",
|
||||||
|
f"Session: {self.session_id} - Install mode: {mode}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
if mode == "automatic":
|
if mode == "automatic":
|
||||||
# Skip partitioning page
|
# Skip partitioning page
|
||||||
next_index = self.page_ids.index("modules")
|
next_index = self.page_ids.index("modules")
|
||||||
@@ -164,6 +380,14 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
# Go to partitioning page
|
# Go to partitioning page
|
||||||
next_index = self.page_ids.index("partitioning")
|
next_index = self.page_ids.index("partitioning")
|
||||||
|
|
||||||
|
if current_page_name == "modules":
|
||||||
|
modules = self.modules_page.get_modules()
|
||||||
|
log_to_discord(
|
||||||
|
"SELECTION",
|
||||||
|
f"Session: {self.session_id} - Selected modules: {modules}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
if current_page_name == "user":
|
if current_page_name == "user":
|
||||||
# Prepare summary instead of installing immediately
|
# Prepare summary instead of installing immediately
|
||||||
disk = self.storage_page.get_selected_disk()
|
disk = self.storage_page.get_selected_disk()
|
||||||
@@ -171,6 +395,13 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
modules = self.modules_page.get_modules()
|
modules = self.modules_page.get_modules()
|
||||||
user_info = self.user_page.get_user_info()
|
user_info = self.user_page.get_user_info()
|
||||||
|
|
||||||
|
# Log user info (without password for security)
|
||||||
|
log_to_discord(
|
||||||
|
"SELECTION",
|
||||||
|
f"Session: {self.session_id} - User: {user_info.get('username', 'N/A')}, Hostname: {user_info.get('hostname', 'N/A')}, Sudo: {user_info.get('allow_sudo', False)}",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
|
||||||
partitions_config = {}
|
partitions_config = {}
|
||||||
if mode == "manual":
|
if mode == "manual":
|
||||||
partitions_config = self.partitioning_page.get_config()
|
partitions_config = self.partitioning_page.get_config()
|
||||||
@@ -196,12 +427,12 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
modules = self.modules_page.get_modules()
|
modules = self.modules_page.get_modules()
|
||||||
user_info = self.user_page.get_user_info()
|
user_info = self.user_page.get_user_info()
|
||||||
|
|
||||||
partitions_config = {}
|
# Log the install trigger with full config
|
||||||
if mode == "manual":
|
log_to_discord(
|
||||||
partitions_config = self.partitioning_page.get_config()
|
"INSTALL_START",
|
||||||
elif mode == "automatic":
|
f"Session: {self.session_id} - Disk: {disk} - Mode: {mode} - Modules: {modules} - Mock: {self.mock_mode}",
|
||||||
partitions = calculate_auto_partitions(disk)
|
"installer",
|
||||||
partitions_config = {"partitions": partitions}
|
)
|
||||||
|
|
||||||
if self.mock_mode:
|
if self.mock_mode:
|
||||||
print("!!! MOCK MODE ENABLED - NO CHANGES WILL BE MADE !!!")
|
print("!!! MOCK MODE ENABLED - NO CHANGES WILL BE MADE !!!")
|
||||||
@@ -209,10 +440,23 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
print(f"Mode: {mode}")
|
print(f"Mode: {mode}")
|
||||||
print(f"Modules: {modules}")
|
print(f"Modules: {modules}")
|
||||||
print(f"User: {user_info}")
|
print(f"User: {user_info}")
|
||||||
print(f"Partition Config: {partitions_config}")
|
|
||||||
print("Simulation complete.")
|
print("Simulation complete.")
|
||||||
|
log_to_discord(
|
||||||
|
"INSTALL_COMPLETE",
|
||||||
|
f"Session: {self.session_id} - Mock installation complete",
|
||||||
|
"installer",
|
||||||
|
)
|
||||||
|
flush_logs()
|
||||||
|
# Show success in UI even in mock
|
||||||
|
self.show_finish_page("Mock Installation Complete!")
|
||||||
else:
|
else:
|
||||||
print("NOT IMPLEMENTED")
|
self.show_progress_page("Installing Iridium OS...")
|
||||||
|
thread = threading.Thread(
|
||||||
|
target=self.run_installation,
|
||||||
|
args=(disk, mode, modules, user_info),
|
||||||
|
daemon=True,
|
||||||
|
)
|
||||||
|
thread.start()
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user