521f1ae9ac
The migration recomputed whether cups-browsed was active at the start of every run, after an earlier run may already have stopped it. A run interrupted between that stop and the completion marker left the service down, and the retry that followed read it as inactive, skipped the restart, and wrote the marker anyway: printer discovery stayed off until the next reboot with no migration left to bring it back. Keying the restart to whether the unit is enabled survives the interruption, and reports not-enabled for a unit the user masked or disabled, which restarting would fail on and abort the migration short of its marker. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-Authored-By: Codex XHigh <noreply@openai.com>
38 lines
1.5 KiB
Bash
38 lines
1.5 KiB
Bash
echo "Separate printer discovery from root and print-filter access"
|
|
|
|
machine_marker="${OMARCHY_CUPS_MIGRATION_MARKER:-/var/lib/omarchy/migrations/1787815267}"
|
|
|
|
[[ ! -e $machine_marker ]] || exit 0
|
|
|
|
# CUPS-PDF accepts a job-controlled post-processing command in a backend that
|
|
# CUPS launches as root. Native application print-to-file support replaces it.
|
|
omarchy-pkg-drop cups-pdf
|
|
|
|
# system-config-printer uses this helper to request printer administration
|
|
# through Polkit now that the desktop user's wheel group is no longer @SYSTEM.
|
|
if omarchy-pkg-present cups; then
|
|
omarchy-pkg-add cups-pk-helper
|
|
fi
|
|
|
|
# Stop the root-running daemon before changing the authorization it relies on.
|
|
if systemctl is-active --quiet cups-browsed.service 2>/dev/null; then
|
|
sudo systemctl stop cups-browsed.service
|
|
fi
|
|
|
|
if omarchy-pkg-present cups; then
|
|
sudo env OMARCHY_PATH="$OMARCHY_PATH" \
|
|
bash -euo pipefail "$OMARCHY_PATH/install/config/printing.sh"
|
|
sudo systemctl daemon-reload
|
|
sudo systemctl try-reload-or-restart cups.service
|
|
fi
|
|
|
|
# Resume on whether the unit is enabled, not on whether it was running when this
|
|
# run started: an interrupted earlier run leaves it stopped, and a retry that
|
|
# recomputed that would skip the restart and still write the marker below. A
|
|
# masked or disabled unit reports not-enabled and is left alone.
|
|
if systemctl is-enabled --quiet cups-browsed.service 2>/dev/null; then
|
|
sudo systemctl restart cups-browsed.service
|
|
fi
|
|
|
|
sudo install -Dm644 /dev/null "$machine_marker"
|