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

Merge pull request #213 from naturallaw777/copilot/remove-chroot-chpasswd-block

Browse Source 
[WIP] Remove chroot/chpasswd block from installer script
This commit is contained in:
Sovran_Systems
2026-04-12 18:10:37 -05:00
committed by GitHub
parent 3a59944967 b610e76659
commit 5084d6ebb8
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
iso/installer.py
View File

@@ -1017,21 +1017,6 @@ class InstallerWindow(Adw.ApplicationWindow):
raise RuntimeError(proc.stderr.strip() or "Failed to write root-password") raise RuntimeError(proc.stderr.strip() or "Failed to write root-password")
run(["sudo", "chmod", "600", "/mnt/var/lib/secrets/root-password"]) run(["sudo", "chmod", "600", "/mnt/var/lib/secrets/root-password"])
proc = subprocess.run(
["sudo", "chroot", "/mnt", "/run/current-system/sw/bin/chpasswd"],
input=f"free:{self.free_password}\nroot:{root_password}",
capture_output=True, text=True
)
if proc.returncode != 0:
proc = subprocess.run(
["sudo", "chroot", "/mnt", "chpasswd"],
input=f"free:{self.free_password}\nroot:{root_password}",
capture_output=True, text=True
)
if proc.returncode != 0:
log(proc.stderr)
raise RuntimeError(proc.stderr.strip() or "Failed to set passwords via chpasswd")
GLib.idle_add(self.push_complete) GLib.idle_add(self.push_complete)
# ── Complete ─────────────────────────────────────────────────────────── # ── Complete ───────────────────────────────────────────────────────────

4
modules/credentials.nix
View File

@@ -107,10 +107,10 @@ in
W3=''${WORD_ARRAY[$((RANDOM % COUNT))]} W3=''${WORD_ARRAY[$((RANDOM % COUNT))]}
DIGIT=$((RANDOM % 10)) DIGIT=$((RANDOM % 10))
ROOT_PASS="$W1-$W2-$W3-$DIGIT" ROOT_PASS="$W1-$W2-$W3-$DIGIT"
echo "root:$ROOT_PASS" | chpasswd
echo "$ROOT_PASS" > "$SECRET_FILE" echo "$ROOT_PASS" > "$SECRET_FILE"
chmod 600 "$SECRET_FILE" chmod 600 "$SECRET_FILE"
fi fi
echo "root:$(cat "$SECRET_FILE")" | chpasswd
''; '';
}; };
@@ -144,10 +144,10 @@ in
W3=''${WORD_ARRAY[$((RANDOM % COUNT))]} W3=''${WORD_ARRAY[$((RANDOM % COUNT))]}
DIGIT=$((RANDOM % 10)) DIGIT=$((RANDOM % 10))
FREE_PASS="$W1-$W2-$W3-$DIGIT" FREE_PASS="$W1-$W2-$W3-$DIGIT"
echo "free:$FREE_PASS" | chpasswd
echo "$FREE_PASS" > "$SECRET_FILE" echo "$FREE_PASS" > "$SECRET_FILE"
chmod 600 "$SECRET_FILE" chmod 600 "$SECRET_FILE"
fi fi
echo "free:$(cat "$SECRET_FILE")" | chpasswd
''; '';
}; };