mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-18 18:02:08 +08:00
feat(linux): reinstall an existing Service during package upgrades
The deb and rpm packages never refreshed an installed Service, and the previous package's prerm/%preun uninstalls it unconditionally. When the Service unit existed before the upgrade, the new postinst/%post now reinstalls it with its group and restores disabled, enabled-runtime, masked-runtime and stopped states. First installs and explicit removals never add a Service. rpm runs the new %post before the old %preun. %post records the transaction process (pid and start time) in /run, and /usr/bin/clash-verge-service-uninstall becomes a wrapper that skips only that %preun call and otherwise runs the real uninstaller, now under /usr/lib/clash-verge-rev. deb has no such ordering: an upgrade from a released version still loses the Service, and later deb upgrades reinstall it in place only once the prerm upgrade guard from #8240 ships. The scripts exit 0, because a failing postinst or %post cannot restore the Service. On failure they write /run/clash-verge-service-upgrade instead; package script output never reaches the GUI. At startup the app offers a reinstall if the Service is not ready and warns if its previous state was not restored. Both notices replay when a window subscribes, and the marker is acknowledged only after both are taken. In-app updates stop a Service-run core and hold the core lifecycle until the package manager exits, including after the 30-second startup timeout. Refs #8515 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -3,8 +3,101 @@ set -e
|
||||
|
||||
chmod +x /usr/bin/clash-verge-service-install
|
||||
chmod +x /usr/bin/clash-verge-service-uninstall
|
||||
# The /usr/bin uninstaller is the service-uninstall.sh wrapper; this is the real binary it runs.
|
||||
chmod +x /usr/lib/clash-verge-rev/clash-verge-service-uninstall
|
||||
chmod +x /usr/bin/clash-verge-service
|
||||
|
||||
SERVICE_UNIT="clash-verge-service.service"
|
||||
SERVICE_UNIT_FILE="/etc/systemd/system/$SERVICE_UNIT"
|
||||
# Read by the app, which offers a reinstall when the package could not keep the Service.
|
||||
UPGRADE_MARKER="/run/clash-verge-service-upgrade"
|
||||
# Read by /usr/bin/clash-verge-service-uninstall to keep the Service through the previous %preun.
|
||||
TRANSACTION_RECORD="/run/clash-verge-service-rpm-upgrade"
|
||||
|
||||
# Set to the previous state when restoring it fails; the app shows it even if the Service is ready.
|
||||
UNRESTORED_STATE=""
|
||||
|
||||
write_upgrade_marker() {
|
||||
(
|
||||
umask 022
|
||||
{
|
||||
printf 'id=%s\n' "$(date +%s%N)"
|
||||
if [ -n "$UNRESTORED_STATE" ]; then
|
||||
printf 'restore=%s\n' "$UNRESTORED_STATE"
|
||||
fi
|
||||
} >"$UPGRADE_MARKER"
|
||||
)
|
||||
}
|
||||
|
||||
# Scriptlets run as children of the process running the rpm transaction; its start time
|
||||
# keeps a stale record from matching a later process that reuses the PID.
|
||||
record_transaction() {
|
||||
local start
|
||||
start="$(sed 's/.*) //' "/proc/$PPID/stat" | cut -d' ' -f20)"
|
||||
[ -n "$start" ] || return 1
|
||||
(umask 022 && printf '%s %s\n' "$PPID" "$start" >"$TRANSACTION_RECORD")
|
||||
}
|
||||
|
||||
existing_service_gid() {
|
||||
local group
|
||||
group="$(sed -n 's/^Group=//p' "$SERVICE_UNIT_FILE" | head -n 1)"
|
||||
if [ -n "$group" ]; then
|
||||
getent group "$group" | cut -d: -f3
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Failures only warn: dpkg and rpm cannot restore the previous Service from a failed postinst,
|
||||
# and a failing script would leave the package unconfigured or make the app report a failed update.
|
||||
# The installer always enables and starts the unit, so the previous enablement and activity are restored.
|
||||
reinstall_existing_service() {
|
||||
local gid="$1" enabled active=no
|
||||
enabled="$(systemctl is-enabled "$SERVICE_UNIT" 2>/dev/null)"
|
||||
if systemctl is-active --quiet "$SERVICE_UNIT"; then
|
||||
active=yes
|
||||
fi
|
||||
local status=0 restored=yes
|
||||
if [ "$enabled" = "masked-runtime" ]; then
|
||||
systemctl unmask --runtime --quiet "$SERVICE_UNIT" || restored=no
|
||||
fi
|
||||
if ! CLASH_VERGE_SERVICE_GID="$gid" /usr/bin/clash-verge-service-install --install-service; then
|
||||
echo "Warning: reinstalling Clash Verge Service failed; Clash Verge will offer to reinstall it." >&2
|
||||
status=1
|
||||
fi
|
||||
case "$enabled" in
|
||||
disabled) systemctl disable --quiet "$SERVICE_UNIT" || restored=no ;;
|
||||
enabled-runtime) { systemctl disable --quiet "$SERVICE_UNIT" && systemctl enable --runtime --quiet "$SERVICE_UNIT"; } || restored=no ;;
|
||||
masked-runtime) systemctl mask --runtime --quiet "$SERVICE_UNIT" || restored=no ;;
|
||||
esac
|
||||
if [ "$active" = "no" ]; then
|
||||
systemctl stop "$SERVICE_UNIT" || restored=no
|
||||
fi
|
||||
if [ "$restored" = "no" ]; then
|
||||
UNRESTORED_STATE="${enabled:-unknown},$([ "$active" = yes ] && echo active || echo inactive)"
|
||||
echo "Warning: restoring the previous Clash Verge Service state ($UNRESTORED_STATE) failed; check it with systemctl." >&2
|
||||
status=1
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
# Upgrades keep an existing Service current; first installs and explicit removals never add one.
|
||||
# A symlinked unit is masked or managed by the administrator and is left alone.
|
||||
# The previous %preun runs after this script; the record keeps it from removing the Service.
|
||||
# Without a record that %preun removes the Service, so the marker makes the app offer a reinstall.
|
||||
if [ "$1" -ge 2 ] && [ -d /run/systemd/system ] && [ -f "$SERVICE_UNIT_FILE" ] && [ ! -L "$SERVICE_UNIT_FILE" ]; then
|
||||
recorded=yes
|
||||
record_transaction || recorded=no
|
||||
gid="$(existing_service_gid)"
|
||||
if [ -z "$gid" ]; then
|
||||
echo "Warning: the Clash Verge Service group could not be resolved; Clash Verge will offer to reinstall the Service." >&2
|
||||
write_upgrade_marker
|
||||
elif reinstall_existing_service "$gid" && [ "$recorded" = yes ]; then
|
||||
rm -f "$UPGRADE_MARKER"
|
||||
else
|
||||
write_upgrade_marker
|
||||
fi
|
||||
fi
|
||||
|
||||
# The enforcement file exists in both Enforcing and Permissive mode.
|
||||
if [ ! -e /sys/fs/selinux/enforce ]; then
|
||||
exit 0
|
||||
|
||||
@@ -1,8 +1,87 @@
|
||||
#!/bin/bash
|
||||
chmod +x /usr/bin/clash-verge-service-install
|
||||
chmod +x /usr/bin/clash-verge-service-uninstall
|
||||
# The /usr/bin uninstaller is the service-uninstall.sh wrapper; this is the real binary it runs.
|
||||
chmod +x /usr/lib/clash-verge-rev/clash-verge-service-uninstall
|
||||
chmod +x /usr/bin/clash-verge-service
|
||||
|
||||
SERVICE_UNIT="clash-verge-service.service"
|
||||
SERVICE_UNIT_FILE="/etc/systemd/system/$SERVICE_UNIT"
|
||||
# Read by the app, which offers a reinstall when the package could not keep the Service.
|
||||
UPGRADE_MARKER="/run/clash-verge-service-upgrade"
|
||||
|
||||
# Set to the previous state when restoring it fails; the app shows it even if the Service is ready.
|
||||
UNRESTORED_STATE=""
|
||||
|
||||
write_upgrade_marker() {
|
||||
(
|
||||
umask 022
|
||||
{
|
||||
printf 'id=%s\n' "$(date +%s%N)"
|
||||
if [ -n "$UNRESTORED_STATE" ]; then
|
||||
printf 'restore=%s\n' "$UNRESTORED_STATE"
|
||||
fi
|
||||
} >"$UPGRADE_MARKER"
|
||||
)
|
||||
}
|
||||
|
||||
existing_service_gid() {
|
||||
local group
|
||||
group="$(sed -n 's/^Group=//p' "$SERVICE_UNIT_FILE" | head -n 1)"
|
||||
if [ -n "$group" ]; then
|
||||
getent group "$group" | cut -d: -f3
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# Failures only warn: dpkg and rpm cannot restore the previous Service from a failed postinst,
|
||||
# and a failing script would leave the package unconfigured or make the app report a failed update.
|
||||
# The installer always enables and starts the unit, so the previous enablement and activity are restored.
|
||||
reinstall_existing_service() {
|
||||
local gid="$1" enabled active=no
|
||||
enabled="$(systemctl is-enabled "$SERVICE_UNIT" 2>/dev/null)"
|
||||
if systemctl is-active --quiet "$SERVICE_UNIT"; then
|
||||
active=yes
|
||||
fi
|
||||
local status=0 restored=yes
|
||||
if [ "$enabled" = "masked-runtime" ]; then
|
||||
systemctl unmask --runtime --quiet "$SERVICE_UNIT" || restored=no
|
||||
fi
|
||||
if ! CLASH_VERGE_SERVICE_GID="$gid" /usr/bin/clash-verge-service-install --install-service; then
|
||||
echo "Warning: reinstalling Clash Verge Service failed; Clash Verge will offer to reinstall it." >&2
|
||||
status=1
|
||||
fi
|
||||
case "$enabled" in
|
||||
disabled) systemctl disable --quiet "$SERVICE_UNIT" || restored=no ;;
|
||||
enabled-runtime) { systemctl disable --quiet "$SERVICE_UNIT" && systemctl enable --runtime --quiet "$SERVICE_UNIT"; } || restored=no ;;
|
||||
masked-runtime) systemctl mask --runtime --quiet "$SERVICE_UNIT" || restored=no ;;
|
||||
esac
|
||||
if [ "$active" = "no" ]; then
|
||||
systemctl stop "$SERVICE_UNIT" || restored=no
|
||||
fi
|
||||
if [ "$restored" = "no" ]; then
|
||||
UNRESTORED_STATE="${enabled:-unknown},$([ "$active" = yes ] && echo active || echo inactive)"
|
||||
echo "Warning: restoring the previous Clash Verge Service state ($UNRESTORED_STATE) failed; check it with systemctl." >&2
|
||||
status=1
|
||||
fi
|
||||
return "$status"
|
||||
}
|
||||
|
||||
# Upgrades keep an existing Service current; first installs and explicit removals never add one.
|
||||
# A symlinked unit is masked or managed by the administrator and is left alone.
|
||||
if [ "$1" = "configure" ] && [ -n "$2" ] && [ -d /run/systemd/system ] &&
|
||||
[ -f "$SERVICE_UNIT_FILE" ] && [ ! -L "$SERVICE_UNIT_FILE" ]; then
|
||||
gid="$(existing_service_gid)"
|
||||
if [ -z "$gid" ]; then
|
||||
echo "Warning: the Clash Verge Service group could not be resolved; Clash Verge will offer to reinstall the Service." >&2
|
||||
write_upgrade_marker
|
||||
elif reinstall_existing_service "$gid"; then
|
||||
rm -f "$UPGRADE_MARKER"
|
||||
else
|
||||
write_upgrade_marker
|
||||
fi
|
||||
fi
|
||||
|
||||
. /etc/os-release
|
||||
|
||||
if [ "$ID" = "deepin" ]; then
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
#!/bin/sh
|
||||
# Installed as /usr/bin/clash-verge-service-uninstall. During an rpm upgrade the new %post
|
||||
# reinstalls an existing Service before the previous package's %preun runs, and released
|
||||
# %preun scripts uninstall it unconditionally through this path. Skip only that call: one
|
||||
# made by a scriptlet of the transaction that %post recorded.
|
||||
RECORD=/run/clash-verge-service-rpm-upgrade
|
||||
UNINSTALLER=/usr/lib/clash-verge-rev/clash-verge-service-uninstall
|
||||
|
||||
# Fields after the parenthesised command name, which may itself contain spaces.
|
||||
stat_field() {
|
||||
sed 's/.*) //' "/proc/$1/stat" 2>/dev/null | cut -d' ' -f"$2"
|
||||
}
|
||||
|
||||
if [ -f "$RECORD" ] && [ ! -L "$RECORD" ] && read -r txn_pid txn_start <"$RECORD" && [ -n "$txn_start" ]; then
|
||||
pid=$PPID
|
||||
depth=0
|
||||
while [ "$depth" -lt 4 ] && [ -n "$pid" ] && [ "$pid" -gt 1 ]; do
|
||||
if [ "$pid" = "$txn_pid" ] && [ "$(stat_field "$pid" 20)" = "$txn_start" ]; then
|
||||
rm -f "$RECORD"
|
||||
echo "Keeping the Clash Verge Service through this upgrade."
|
||||
exit 0
|
||||
fi
|
||||
pid="$(stat_field "$pid" 2)"
|
||||
depth=$((depth + 1))
|
||||
done
|
||||
fi
|
||||
|
||||
exec "$UNINSTALLER" "$@"
|
||||
Reference in New Issue
Block a user