diff options
| author | Craig Jennings <c@cjennings.net> | 2026-02-12 12:06:33 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-02-12 12:06:33 -0600 |
| commit | 5df64c76d386fd2de863d21a2b1269d53e1a39f9 (patch) | |
| tree | 7ed3e3a4cccbafe109ff8c87ec8b1e3cfb120141 /custom | |
| parent | 24a681c0696fbdad9c32073ffd24cf7218296ed2 (diff) | |
| download | archangel-5df64c76d386fd2de863d21a2b1269d53e1a39f9.tar.gz archangel-5df64c76d386fd2de863d21a2b1269d53e1a39f9.zip | |
fix: archzfs key prompt hang, test false positive, add local distribution
- Change archzfs SigLevel to Never (pacstrap -K empty keyring caused
interactive GPG prompt blocking unattended installs)
- Fix pgrep matching avahi-daemon's [archangel.local] in full-test.sh
- Bump install timeout to 30min for DKMS builds
- Add ~/downloads/isos and archsetup inbox to build-release distribution
- Sync templates
Diffstat (limited to 'custom')
| -rwxr-xr-x | custom/archangel | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/custom/archangel b/custom/archangel index 9076ac2..430bc4a 100755 --- a/custom/archangel +++ b/custom/archangel @@ -913,17 +913,15 @@ install_base() { pacman-key --init pacman-key --populate archlinux - # Add archzfs key - pacman-key -r DDF7DB817396A49B2A2723F7403BD972F75D9D76 2>/dev/null || true - pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76 2>/dev/null || true - # Add archzfs repo to pacman.conf for pacstrap + # SigLevel=Never: pacstrap -K creates empty keyring where key import fails; + # repo is explicitly added and served over HTTPS, GPG adds no real value here if ! grep -q "\[archzfs\]" /etc/pacman.conf; then cat >> /etc/pacman.conf << 'EOF' [archzfs] Server = https://archzfs.com/$repo/$arch -SigLevel = Optional TrustAll +SigLevel = Never EOF fi @@ -1026,19 +1024,15 @@ configure_system() { 127.0.1.1 $HOSTNAME.localdomain $HOSTNAME EOF - # Add archzfs repo + # Add archzfs repo (SigLevel=Never — same rationale as install_base) info "Adding archzfs repository..." cat >> /mnt/etc/pacman.conf << 'EOF' [archzfs] Server = https://archzfs.com/$repo/$arch -SigLevel = Optional TrustAll +SigLevel = Never EOF - # Import archzfs key - arch-chroot /mnt pacman-key -r DDF7DB817396A49B2A2723F7403BD972F75D9D76 2>/dev/null || true - arch-chroot /mnt pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76 2>/dev/null || true - # Configure journald for ZFS # Problem: journald starts before ZFS mounts /var/log, so journal files # get created in tmpfs then hidden when ZFS mounts over it. |
