Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78 from naturallaw777/copilot/fix-disko-command-wipe-handling

Browse Source 
[WIP] Fix disko command handling in installer
This commit is contained in:
Sovran_Systems
2026-04-05 10:19:20 -05:00
committed by GitHub
parent a59165c31e cf09845431
commit 9386b073ba
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iso/installer.py
View File

@@ -728,27 +728,18 @@ class InstallerWindow(Adw.ApplicationWindow):
# Short settle so the kernel finishes re-reading # Short settle so the kernel finishes re-reading
time.sleep(2) time.sleep(2)
# ── Now run disko on a clean disk ── # ── Now run disko to partition, format, and mount ──
GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n") # Disks are already wiped clean by sgdisk/wipefs above,
cmd_destroy = [ # so we only need disko to create partitions, format, and mount.
"sudo", "disko", "--mode", "destroy", GLib.idle_add(append_text, buf, "\n=== Partitioning and formatting drives ===\n")
"--yes-wipe-all-disks", cmd = [
f"{FLAKE}/iso/disko.nix",
"--arg", "device", boot_path
]
if data_path:
cmd_destroy += ["--arg", "dataDevice", data_path]
run_stream(cmd_destroy, buf)
GLib.idle_add(append_text, buf, "\n=== Formatting and mounting drives ===\n")
cmd_format = [
"sudo", "disko", "--mode", "format,mount", "sudo", "disko", "--mode", "format,mount",
f"{FLAKE}/iso/disko.nix", f"{FLAKE}/iso/disko.nix",
"--arg", "device", boot_path "--arg", "device", boot_path
] ]
if data_path: if data_path:
cmd_format += ["--arg", "dataDevice", data_path] cmd += ["--arg", "dataDevice", data_path]
run_stream(cmd_format, buf) run_stream(cmd, buf)
GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n") GLib.idle_add(append_text, buf, "\n=== Generating hardware config ===\n")
run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf) run_stream(["sudo", "nixos-generate-config", "--root", "/mnt"], buf)