mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-13 10:50:48 +01:00
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
163 lines
4.9 KiB
Bash
Executable File
163 lines
4.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# The migration and rollback steps for hosts-guard, plus their validation and
|
|
# status reporting.
|
|
#
|
|
# Sourced by the entry script, which owns the CLI and the instance registry.
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Preconditions
|
|
# ----------------------------------------------------------------------------
|
|
validate_requirements() {
|
|
# SYSTEMD_UNIT_DIR and PACMAN_DB_LCK default to the real locations and
|
|
# are overridden only by the test harness, which runs un-jailed in
|
|
# ci_mirror.sh and in CI where a bind mount would protect nothing.
|
|
[[ -x $GUARDCTL ]] || {
|
|
err "guardctl not found at $GUARDCTL - run guard-lib's install.sh first"
|
|
exit 1
|
|
}
|
|
|
|
local unit
|
|
for unit in guard-file@.path guard-file@.service guard-bind-mount@.service; do
|
|
[[ -f "${SYSTEMD_UNIT_DIR:-/etc/systemd/system}/$unit" ]] || {
|
|
err "missing systemd template ${SYSTEMD_UNIT_DIR:-/etc/systemd/system}/$unit - run guard-lib's install.sh first"
|
|
exit 1
|
|
}
|
|
done
|
|
|
|
[[ -d $PLUGIN_SRC_DIR ]] || {
|
|
err "plugin sources not found at $PLUGIN_SRC_DIR"
|
|
exit 1
|
|
}
|
|
|
|
# A live transaction would race every chattr and umount below.
|
|
if [[ -e "${PACMAN_DB_LCK:-/var/lib/pacman/db.lck}" ]]; then
|
|
err "${PACMAN_DB_LCK:-/var/lib/pacman/db.lck} exists - a pacman transaction is in flight"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
install_plugins() {
|
|
run mkdir -p "$PLUGIN_INSTALL_DIR"
|
|
local src
|
|
for src in "$PLUGIN_SRC_DIR"/*.sh; do
|
|
[[ -e $src ]] || continue
|
|
run install -m 755 "$src" "$PLUGIN_INSTALL_DIR/$(basename "$src")"
|
|
done
|
|
msg "plugins installed to $PLUGIN_INSTALL_DIR"
|
|
}
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Migration
|
|
# ----------------------------------------------------------------------------
|
|
stop_legacy_units_for() { # <instance name>
|
|
local prefix="$1"
|
|
local unit
|
|
for unit in "${LEGACY_UNITS[@]}"; do
|
|
[[ $unit == "$prefix"-* ]] || continue
|
|
systemctl list-unit-files "$unit" &>/dev/null || continue
|
|
run systemctl disable --now "$unit" 2>/dev/null || true
|
|
done
|
|
}
|
|
|
|
# Unmount every stacked bind layer so chattr can reach the real inode. Mirrors
|
|
# the legacy pacman-pre-unlock-hosts.sh, which had to do exactly this.
|
|
# Every branch is a full `if` and the function ends in an explicit `return 0`.
|
|
# The obvious `((i > 20)) && break` form leaves the loop body's exit status at 1
|
|
# whenever the arithmetic is false, and under `set -e` that aborted the whole
|
|
# rollback silently — but ONLY when the loop actually ran, so --dry-run and an
|
|
# already-unmounted target both looked fine. It cost a live /etc/hosts left with
|
|
# neither the immutable flag nor its read-only mount to notice.
|
|
collapse_mounts() { # <path>
|
|
local target="$1" i=0
|
|
while mountpoint -q "$target"; do
|
|
if ! run umount -l "$target" 2>/dev/null; then
|
|
break
|
|
fi
|
|
i=$((i + 1))
|
|
if ((i > 20)); then
|
|
break
|
|
fi
|
|
# Nothing is really unmounted under --dry-run, so `mountpoint` stays
|
|
# true forever; report the intent once instead of 20 identical lines.
|
|
if ((DRY_RUN == 1)); then
|
|
break
|
|
fi
|
|
done
|
|
return 0
|
|
}
|
|
|
|
migrate_instance() { # <name>
|
|
local name="$1"
|
|
local spec target bind plugin also_watch
|
|
spec="$(instance_spec "$name")"
|
|
IFS='|' read -r target bind plugin also_watch <<<"$spec"
|
|
|
|
if instance_registered "$name"; then
|
|
msg "$name already registered - skipping"
|
|
return 0
|
|
fi
|
|
|
|
if [[ ! -e $target ]]; then
|
|
warn "$name: target $target does not exist - skipping"
|
|
return 0
|
|
fi
|
|
|
|
note "migrating $name ($target)"
|
|
|
|
stop_legacy_units_for "$name"
|
|
collapse_mounts "$target"
|
|
run chattr -i "$target" 2>/dev/null || true
|
|
|
|
local -a args=(file-guard install "$name" --target "$target")
|
|
[[ $bind == "yes" ]] && args+=(--bind-mount)
|
|
[[ -n $plugin ]] && args+=(--plugin "$PLUGIN_INSTALL_DIR/$plugin")
|
|
[[ -n $also_watch ]] && args+=(--also-watch "$also_watch")
|
|
|
|
run "$GUARDCTL" "${args[@]}"
|
|
msg "$name migrated"
|
|
}
|
|
|
|
retire_legacy_hooks() {
|
|
local hook removed=0
|
|
for hook in "${LEGACY_HOOKS[@]}"; do
|
|
if [[ -f "$HOOKS_DIR/$hook" ]]; then
|
|
run rm -f "$HOOKS_DIR/$hook"
|
|
msg "retired $hook"
|
|
removed=1
|
|
fi
|
|
done
|
|
((removed == 0)) && msg "legacy pacman hooks already retired"
|
|
return 0
|
|
}
|
|
|
|
do_migrate() {
|
|
validate_requirements
|
|
save_rollback_state
|
|
install_plugins
|
|
|
|
local name
|
|
for name in "${INSTANCES[@]}"; do
|
|
migrate_instance "$name"
|
|
done
|
|
|
|
# Only retire the legacy hooks once guard-lib actually owns something -
|
|
# otherwise a failed migration would leave the files with NO pacman
|
|
# unlock hook at all, and the next transaction would fight chattr +i.
|
|
local registered=0
|
|
for name in "${INSTANCES[@]}"; do
|
|
instance_registered "$name" && registered=$((registered + 1))
|
|
done
|
|
|
|
if ((registered == 0)) && ((DRY_RUN == 0)); then
|
|
err "no guard-lib instance registered - refusing to retire the legacy hooks"
|
|
exit 1
|
|
fi
|
|
|
|
retire_legacy_hooks
|
|
|
|
printf "\n"
|
|
msg "migration complete ($registered instance(s) registered)"
|
|
note "verify with: sudo $SCRIPT_NAME --status"
|
|
note "undo with: sudo $SCRIPT_NAME --rollback"
|
|
}
|