Fix three installer blockers: disko --yes-wipe-all-disks, stdin=DEVNULL, nixos-install --no-root-password
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/477c45ee-0958-4ba8-9612-a3be1bff9c6d Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6d3dbf497e
commit
5b1454adf6
@@ -38,7 +38,8 @@ def run(cmd):
|
|||||||
|
|
||||||
def run_stream(cmd, buf):
|
def run_stream(cmd, buf):
|
||||||
log(f"$ {' '.join(cmd)}")
|
log(f"$ {' '.join(cmd)}")
|
||||||
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
|
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
||||||
|
stdin=subprocess.DEVNULL, text=True)
|
||||||
for line in proc.stdout:
|
for line in proc.stdout:
|
||||||
log(line.rstrip())
|
log(line.rstrip())
|
||||||
GLib.idle_add(append_text, buf, line)
|
GLib.idle_add(append_text, buf, line)
|
||||||
@@ -731,6 +732,7 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n")
|
GLib.idle_add(append_text, buf, "\n=== Partitioning drives ===\n")
|
||||||
cmd = [
|
cmd = [
|
||||||
"sudo", "disko", "--mode", "destroy,format,mount",
|
"sudo", "disko", "--mode", "destroy,format,mount",
|
||||||
|
"--yes-wipe-all-disks",
|
||||||
f"{FLAKE}/iso/disko.nix",
|
f"{FLAKE}/iso/disko.nix",
|
||||||
"--arg", "device", boot_path
|
"--arg", "device", boot_path
|
||||||
]
|
]
|
||||||
@@ -848,7 +850,8 @@ class InstallerWindow(Adw.ApplicationWindow):
|
|||||||
run_stream([
|
run_stream([
|
||||||
"sudo", "nixos-install",
|
"sudo", "nixos-install",
|
||||||
"--root", "/mnt",
|
"--root", "/mnt",
|
||||||
"--flake", "/mnt/etc/nixos#nixos"
|
"--flake", "/mnt/etc/nixos#nixos",
|
||||||
|
"--no-root-password"
|
||||||
], buf)
|
], buf)
|
||||||
|
|
||||||
GLib.idle_add(self.push_complete)
|
GLib.idle_add(self.push_complete)
|
||||||
|
|||||||
Reference in New Issue
Block a user