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

Fix chpasswd: run directly from host with --root /mnt, no chroot needed

Browse Source 
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/3ff98bf4-8f62-4c81-90fd-36854e88266f

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-07 17:14:32 +00:00
committed by GitHub
parent deae53b721
commit 65ce66a541
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
iso/installer.py
View File

@@ -1000,24 +1000,27 @@ class InstallerWindow(Adw.ApplicationWindow):
raise RuntimeError(proc.stderr.strip() or "Failed to write password file") raise RuntimeError(proc.stderr.strip() or "Failed to write password file")
run(["sudo", "chmod", "600", "/mnt/var/lib/secrets/free-password"]) run(["sudo", "chmod", "600", "/mnt/var/lib/secrets/free-password"])
# Locate chpasswd in the installed system's Nix store # Find chpasswd in the installed system's Nix store
# We run it directly from the host with --root /mnt so it
# modifies /mnt/etc/shadow — no chroot needed.
chpasswd_find = subprocess.run( chpasswd_find = subprocess.run(
["sudo", "find", "/mnt/nix/store", "-name", "chpasswd", "-type", "f", "-path", "*/bin/chpasswd"], ["sudo", "find", "/mnt/nix/store", "-maxdepth", "3",
"-name", "chpasswd", "-type", "f", "-path", "*/bin/chpasswd"],
capture_output=True, text=True capture_output=True, text=True
) )
chpasswd_paths = chpasswd_find.stdout.strip().splitlines() chpasswd_paths = chpasswd_find.stdout.strip().splitlines()
if not chpasswd_paths: if not chpasswd_paths:
raise RuntimeError("chpasswd binary not found in /mnt/nix/store") raise RuntimeError("chpasswd binary not found in /mnt/nix/store")
# Use the first match; strip the /mnt prefix for chroot-relative path # Use the full host path (e.g. /mnt/nix/store/...-shadow-xxx/bin/chpasswd)
chpasswd_bin = chpasswd_paths[0][len("/mnt"):] chpasswd_bin = chpasswd_paths[0]
proc = subprocess.run( proc = subprocess.run(
["sudo", "chroot", "/mnt", "sh", "-c", ["sudo", chpasswd_bin, "--root", "/mnt"],
f"echo 'free:{password}' | {chpasswd_bin}"], input=f"free:{password}",
capture_output=True, text=True capture_output=True, text=True
) )
if proc.returncode != 0: if proc.returncode != 0:
raise RuntimeError(proc.stderr.strip() or "Failed to set password in chroot") raise RuntimeError(proc.stderr.strip() or "Failed to set password")
run(["sudo", "touch", "/mnt/var/lib/sovran-customer-onboarded"]) run(["sudo", "touch", "/mnt/var/lib/sovran-customer-onboarded"])
except Exception as e: except Exception as e: