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 <ben@nousresearch.com>
This commit is contained in:
@@ -755,6 +755,7 @@ class S6ServiceManager:
|
|||||||
# dirs are each managed by their own log/run. See #45258.
|
# 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 hermes:hermes "$HERMES_HOME/logs/gateways" 2>/dev/null || true\n'
|
||||||
f'chown -R hermes:hermes "$log_dir" 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).
|
# Skip the drop when already non-root (CAP_SETGID).
|
||||||
f'[ "$(id -u)" = 0 ] || exec s6-log 1 n10 s1000000 T "$log_dir"\n'
|
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'
|
f'exec s6-setuidgid hermes s6-log 1 n10 s1000000 T "$log_dir"\n'
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ AUTHOR_MAP = {
|
|||||||
"290859878+synapsesx@users.noreply.github.com": "synapsesx",
|
"290859878+synapsesx@users.noreply.github.com": "synapsesx",
|
||||||
"157689911+itsflownium@users.noreply.github.com": "itsflownium",
|
"157689911+itsflownium@users.noreply.github.com": "itsflownium",
|
||||||
"dirtyren@users.noreply.github.com": "dirtyren",
|
"dirtyren@users.noreply.github.com": "dirtyren",
|
||||||
|
"35259607+zxcasongs@users.noreply.github.com": "zxcasongs",
|
||||||
"alfred@my-cloud.me": "alfred-smith-0",
|
"alfred@my-cloud.me": "alfred-smith-0",
|
||||||
"tangtaizhong792@gmail.com": "tangtaizong666",
|
"tangtaizhong792@gmail.com": "tangtaizong666",
|
||||||
"github@aldo.pw": "aldoeliacim",
|
"github@aldo.pw": "aldoeliacim",
|
||||||
|
|||||||
Reference in New Issue
Block a user