mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-13 15:10:47 +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
144 lines
5.0 KiB
Bash
Executable File
144 lines
5.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Rollback state capture, rollback itself, and status reporting for the
|
|
# hosts-guard migration.
|
|
#
|
|
# Sourced by the entry script alongside hosts_guard_migrate.sh.
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Status
|
|
# ----------------------------------------------------------------------------
|
|
show_status() {
|
|
printf "\n%s\n" "=== guard-lib instances ==="
|
|
local name
|
|
for name in "${INSTANCES[@]}"; do
|
|
if instance_registered "$name"; then
|
|
msg "$name registered"
|
|
"$GUARDCTL" file-guard status "$name" 2>&1 | sed 's/^/ /'
|
|
else
|
|
warn "$name NOT registered"
|
|
fi
|
|
done
|
|
|
|
printf "\n%s\n" "=== legacy pacman hooks ==="
|
|
local hook
|
|
for hook in "${LEGACY_HOOKS[@]}"; do
|
|
if [[ -f "$HOOKS_DIR/$hook" ]]; then
|
|
warn "$hook still present"
|
|
else
|
|
msg "$hook retired"
|
|
fi
|
|
done
|
|
|
|
printf "\n%s\n" "=== legacy systemd units ==="
|
|
local unit state
|
|
for unit in "${LEGACY_UNITS[@]}"; do
|
|
# `is-enabled` PRINTS the state but EXITS 1 for anything not enabled, so
|
|
# `|| echo absent` would append a second line to a perfectly good answer.
|
|
state="$(systemctl is-enabled "$unit" 2>/dev/null)" || true
|
|
[[ -n $state ]] || state="absent"
|
|
if [[ $state == "enabled" ]]; then
|
|
warn "$unit is $state"
|
|
else
|
|
msg "$unit is $state"
|
|
fi
|
|
done
|
|
}
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Rollback state
|
|
# ----------------------------------------------------------------------------
|
|
save_rollback_state() {
|
|
run mkdir -p "$STATE_DIR/hooks"
|
|
|
|
local hook
|
|
for hook in "${LEGACY_HOOKS[@]}"; do
|
|
if [[ -f "$HOOKS_DIR/$hook" && ! -f "$STATE_DIR/hooks/$hook" ]]; then
|
|
run cp -a "$HOOKS_DIR/$hook" "$STATE_DIR/hooks/$hook"
|
|
note "backed up $hook"
|
|
fi
|
|
done
|
|
|
|
# Record enablement so rollback restores the exact prior state rather than
|
|
# guessing (resolved-guard.* were already disabled here, for instance).
|
|
if [[ ! -f "$STATE_DIR/units.state" ]] && ((DRY_RUN == 0)); then
|
|
local unit ustate
|
|
for unit in "${LEGACY_UNITS[@]}"; do
|
|
ustate="$(systemctl is-enabled "$unit" 2>/dev/null)" || true
|
|
[[ -n $ustate ]] || ustate="absent"
|
|
printf '%s=%s\n' "$unit" "$ustate"
|
|
done >"$STATE_DIR/units.state"
|
|
note "recorded legacy unit states in $STATE_DIR/units.state"
|
|
fi
|
|
}
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# Rollback
|
|
# ----------------------------------------------------------------------------
|
|
do_rollback() {
|
|
[[ -d $STATE_DIR ]] || {
|
|
err "no rollback state at $STATE_DIR - nothing to roll back to"
|
|
exit 1
|
|
}
|
|
|
|
local name
|
|
for name in "${INSTANCES[@]}"; do
|
|
if instance_registered "$name"; then
|
|
# Keep the canonical: it is the known-good copy of the file, and
|
|
# the legacy layer re-snapshots from the live file, which may have
|
|
# drifted. Losing it would turn a rollback into data loss.
|
|
run "$GUARDCTL" file-guard uninstall "$name" --keep-canonical || true
|
|
msg "uninstalled guard-lib instance $name"
|
|
fi
|
|
done
|
|
|
|
local hook
|
|
for hook in "${LEGACY_HOOKS[@]}"; do
|
|
if [[ -f "$STATE_DIR/hooks/$hook" ]]; then
|
|
run cp -a "$STATE_DIR/hooks/$hook" "$HOOKS_DIR/$hook"
|
|
msg "restored $hook"
|
|
fi
|
|
done
|
|
|
|
if [[ -f "$STATE_DIR/units.state" ]]; then
|
|
local unit state
|
|
while IFS='=' read -r unit state; do
|
|
[[ $state == "enabled" ]] || continue
|
|
run systemctl enable --now "$unit" 2>/dev/null || warn "could not re-enable $unit"
|
|
msg "re-enabled $unit"
|
|
done <"$STATE_DIR/units.state"
|
|
else
|
|
warn "no units.state recorded - legacy units left as-is"
|
|
fi
|
|
|
|
# Re-assert the legacy protections NOW rather than waiting for a watcher.
|
|
# `guardctl file-guard uninstall` chattr -i's the target on its way out, and
|
|
# the legacy *-guard.path units only fire on PathModified - so without this
|
|
# a rolled-back /etc/hosts sits with NO immutable flag until something
|
|
# happens to write to it. Caught by actually running --rollback and looking
|
|
# at lsattr, which is the only reason it is handled at all.
|
|
#
|
|
# Order matters for hosts specifically: it is bind-mounted read-only, and
|
|
# chattr cannot write through a ro mount. enforce-hosts.sh does a bare
|
|
# `chattr +i` with no collapse (it relies on running before the mount at
|
|
# boot), so it fails silently here unless the mount is dropped first. So:
|
|
# collapse, enforce, then let the bind-mount unit rebuild the ro layer.
|
|
# HOSTS_FILE is a seam for the tests; production always passes the real
|
|
# path, which is the file this whole rollback exists to re-protect.
|
|
collapse_mounts "${HOSTS_FILE:-/etc/hosts}"
|
|
|
|
local svc
|
|
for svc in hosts-guard.service nsswitch-guard.service resolved-guard.service; do
|
|
systemctl cat "$svc" &>/dev/null || continue
|
|
run systemctl start "$svc" 2>/dev/null || warn "could not run $svc"
|
|
done
|
|
|
|
if systemctl cat hosts-bind-mount.service &>/dev/null; then
|
|
run systemctl restart hosts-bind-mount.service 2>/dev/null || warn "could not restart hosts-bind-mount.service"
|
|
fi
|
|
msg "re-ran legacy enforcement (restores chattr +i and the ro bind mount)"
|
|
|
|
printf "\n"
|
|
msg "rollback complete"
|
|
note "verify with: sudo $SCRIPT_NAME --status"
|
|
}
|