Fix Void package lifecycle on host
This commit is contained in:
@@ -319,16 +319,37 @@ def _runit_is_enabled() -> bool:
|
||||
def _runit_is_running() -> bool:
|
||||
"""Check if the runit service is currently running.
|
||||
|
||||
Looks for a 'supervise/pid' file in the service directory.
|
||||
Looks for a 'supervise/pid' file in the service directory. Void creates
|
||||
that directory root-only, so unprivileged dashboard reads fall back to
|
||||
the public process table when they cannot traverse it.
|
||||
"""
|
||||
def runsv_process_exists() -> bool:
|
||||
try:
|
||||
result = subprocess.run(
|
||||
["pgrep", "-f", "^runsv fenris-collect$"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=5,
|
||||
)
|
||||
return result.returncode == 0
|
||||
except (FileNotFoundError, subprocess.TimeoutExpired, OSError):
|
||||
return False
|
||||
|
||||
pid_file = FENRIS_SV_DIR / "supervise" / "pid"
|
||||
# On Void, Path.exists() is false for an unprivileged process when it
|
||||
# cannot traverse runit's root-only supervise directory.
|
||||
if not pid_file.exists():
|
||||
return False
|
||||
return FENRIS_SERVICE_LINK.exists() and runsv_process_exists()
|
||||
try:
|
||||
pid = int(pid_file.read_text().strip())
|
||||
# Check if the process is alive
|
||||
os.kill(pid, 0)
|
||||
return True
|
||||
except PermissionError:
|
||||
# runsv's supervisor state is root-only on Void. Its process command
|
||||
# is still observable, which gives the read-only UI the same runtime
|
||||
# fact without granting it service-control permissions.
|
||||
return FENRIS_SERVICE_LINK.exists() and runsv_process_exists()
|
||||
except (ValueError, OSError):
|
||||
return False
|
||||
|
||||
|
||||
Reference in New Issue
Block a user