libvirt group: check at summary time (final state) + OR-semantics gate

Fresh-VM timeline explained: on run 1 virt-manager installs AFTER the
niri module's prereq check ran (menu dispatch order), so the group add
was evaluated against a package state that did not include it yet. A
second run 'fixed' it — matching the observed behavior.

- New ensure_libvirt_group runs in the Summary section, seeing the FINAL
  package state; menu/module-time check kept as an early pass.
- pkg_installed is AND-semantics (all must be installed); the gate needs
  OR. New pkg_installed_any helper; both gates switched to it.
- Also fixed a set -e trap: '$done_any && ok' returned 1 (killing the
  script) when no optional tools were picked — replaced with an if.
All four gate cases harness-proven: virt-only, menu-pick, no-virt,
already-in-group.
This commit is contained in:
Pathfinder
2026-10-27 15:50:30 +01:00
parent df56379556
commit f069026a7c
3 changed files with 35 additions and 2 deletions
+11
View File
@@ -92,6 +92,17 @@ pkg_installed() {
return 0 return 0
} }
# True if ANY of the listed packages is installed (pkg_installed is AND).
pkg_installed_any() {
local p
for p in "$@"; do
if rpm -q "$p" &>/dev/null; then
return 0
fi
done
return 1
}
remove_packages() { remove_packages() {
local packages_to_remove=() local packages_to_remove=()
for pkg in "$@"; do for pkg in "$@"; do
+1 -1
View File
@@ -134,7 +134,7 @@ UNIT
# requires libvirt-glib client-side, so on a fresh VM libvirt can be # requires libvirt-glib client-side, so on a fresh VM libvirt can be
# functionally present via libvirt-daemon* without rpm -q libvirt passing # functionally present via libvirt-daemon* without rpm -q libvirt passing
# (VM-proven: user stuck in yuri+wheel with virt-manager installed). # (VM-proven: user stuck in yuri+wheel with virt-manager installed).
if pkg_installed libvirt libvirt-daemon libvirt-daemon-driver-qemu virt-manager \ if pkg_installed_any libvirt libvirt-daemon libvirt-daemon-driver-qemu virt-manager \
|| [[ -x /usr/sbin/libvirtd ]]; then || [[ -x /usr/sbin/libvirtd ]]; then
local real_user="${SUDO_USER:-$USER}" local real_user="${SUDO_USER:-$USER}"
if ! id -nG "$real_user" 2>/dev/null | grep -qw libvirt; then if ! id -nG "$real_user" 2>/dev/null | grep -qw libvirt; then
+23 -1
View File
@@ -525,7 +525,10 @@ run_advanced_menu() {
unset to_install; local -a to_install=() # fresh slate for next pick unset to_install; local -a to_install=() # fresh slate for next pick
fi fi
done done
$done_any && ok "Optional tools installed." # not `&& ok` — a false done_any would return 1 and kill the script under set -e
if [[ "$done_any" == "true" ]]; then
ok "Optional tools installed."
fi
} }
# Per-category pre-repo wiring. Add third-party repos here when you add an # Per-category pre-repo wiring. Add third-party repos here when you add an
@@ -584,6 +587,25 @@ pause_if_debug
step "8 Summary" step "8 Summary"
rule rule
# Post-install wiring that must see the FINAL package state. The libvirt
# group add earlier (menu/module time) can miss packages installed later in
# the same run — this is the authoritative pass (VM-proven: a fresh run left
# the user out of the group when virt-manager landed after the check).
ensure_libvirt_group() {
# shellcheck source=lib/common.sh
source "$SCRIPT_DIR/lib/common.sh" 2>/dev/null || true
if pkg_installed_any libvirt libvirt-daemon libvirt-daemon-driver-qemu virt-manager \
|| [[ -x /usr/sbin/libvirtd ]]; then
local real_user="${SUDO_USER:-$USER}"
if ! id -nG "$real_user" 2>/dev/null | grep -qw libvirt; then
info "Adding $real_user to the libvirt group (re-login to apply)..."
sudo usermod -aG libvirt "$real_user" || true
warn "Group membership applies after re-login — do it before using virt-manager."
fi
fi
}
ensure_libvirt_group
ok "DE: $DE" ok "DE: $DE"
ok "TWM: $TWM" ok "TWM: $TWM"
ok "SELinux: $([[ "$SELINUX_DISABLED" == "true" ]] && echo disabled || echo keeping)" ok "SELinux: $([[ "$SELINUX_DISABLED" == "true" ]] && echo disabled || echo keeping)"