diff --git a/blank-32g.qcow2 b/blank-32g.qcow2 new file mode 100644 index 0000000..9a6b785 Binary files /dev/null and b/blank-32g.qcow2 differ diff --git a/blank-vars.fd b/blank-vars.fd new file mode 100644 index 0000000..73f3cf1 Binary files /dev/null and b/blank-vars.fd differ diff --git a/patch.sh b/patch.sh index 1d26f31..4af53ad 100644 --- a/patch.sh +++ b/patch.sh @@ -115,6 +115,25 @@ p.write_text(s.replace(old, new, 1)) print("patched shepherd-1.0 origin with starting-message patch") PY +# Make connman verbose: run it with --debug and send its output to the console +# instead of /var/log/connman.log, so a networking hang explains itself. +python3 - "$SRC" <<'PY' +import sys +from pathlib import Path +p = Path(sys.argv[1]) / "gnu/services/networking.scm" +s = p.read_text() +old = '"--nodnsproxy"' +new = '"--nodnsproxy" "--debug"' +assert s.count(old) == 1, f"expected one --nodnsproxy, found {s.count(old)}" +s = s.replace(old, new, 1) +old2 = '#:log-file "/var/log/connman.log"' +new2 = '#:log-file "/dev/console"' +assert s.count(old2) == 1, f"expected one connman.log, found {s.count(old2)}" +s = s.replace(old2, new2, 1) +p.write_text(s) +print("patched connman to be verbose on the console") +PY + # Sign the patched tree as an orphan commit (no parent), so that guix pull's # clone never tries to fetch the pinned commit's absent parent. gpg --batch --import /workspace/keys/private.key >/dev/null 2>&1 diff --git a/start.sh b/start.sh index 67bf644..c9b34ad 100755 --- a/start.sh +++ b/start.sh @@ -18,4 +18,5 @@ exec qemu-system-aarch64 \ -drive if=virtio,format=qcow2,file=/Users/morkswork/Downloads/guix-install-aarch64-linux.qcow2 \ -drive if=virtio,format=qcow2,file="$DIR/blank-32g.qcow2" \ -nic user,model=virtio-net-pci \ + -display none -serial stdio -monitor none \ "$@"