From c2b7669ad3dd02232d06cde36f6e56ef04dec970 Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Sun, 14 Jun 2026 21:10:51 -0700 Subject: [PATCH] fix(s6): clear stale log lock before startup (#46289) * fix(cli): clear stale s6-log lock file before startup on virtiofs * chore(release): map salvaged contributor --------- Co-authored-by: zxcasongs <35259607+zxcasongs@users.noreply.github.com> Co-authored-by: Ben --- hermes_cli/service_manager.py | 1 + scripts/release.py | 1 + 2 files changed, 2 insertions(+) diff --git a/hermes_cli/service_manager.py b/hermes_cli/service_manager.py index 4e398228b5b..8a12a82d819 100644 --- a/hermes_cli/service_manager.py +++ b/hermes_cli/service_manager.py @@ -755,6 +755,7 @@ class S6ServiceManager: # dirs are each managed by their own log/run. See #45258. f'chown hermes:hermes "$HERMES_HOME/logs/gateways" 2>/dev/null || true\n' f'chown -R hermes:hermes "$log_dir" 2>/dev/null || true\n' + f'rm -f "$log_dir/lock"\n' # Skip the drop when already non-root (CAP_SETGID). f'[ "$(id -u)" = 0 ] || exec s6-log 1 n10 s1000000 T "$log_dir"\n' f'exec s6-setuidgid hermes s6-log 1 n10 s1000000 T "$log_dir"\n' diff --git a/scripts/release.py b/scripts/release.py index d596d5779a7..63fb97a49c5 100755 --- a/scripts/release.py +++ b/scripts/release.py @@ -84,6 +84,7 @@ AUTHOR_MAP = { "290859878+synapsesx@users.noreply.github.com": "synapsesx", "157689911+itsflownium@users.noreply.github.com": "itsflownium", "dirtyren@users.noreply.github.com": "dirtyren", + "35259607+zxcasongs@users.noreply.github.com": "zxcasongs", "alfred@my-cloud.me": "alfred-smith-0", "tangtaizhong792@gmail.com": "tangtaizong666", "github@aldo.pw": "aldoeliacim",