vasilito
5851974b20
Release fork infrastructure: - REDBEAR_RELEASE=0.1.1 with offline enforcement (fetch/distclean/unfetch blocked) - 195 BLAKE3-verified source archives in standard format - Atomic provisioning via provision-release.sh (staging + .complete sentry) - 5-phase improvement plan: restore format auto-detection, source tree validation (validate-source-trees.py), archive-map.json, REPO_BINARY fallback Archive normalization: - Removed 87 duplicate/unversioned archives from shared pool - Regenerated all archives in consistent format with source/ + recipe.toml - BLAKE3SUMS and manifest.json generated from stable tarball set Patch management: - verify-patches.sh: pre-sync dry-run report (OK/REVERSED/CONFLICT) - 121 upstream-absorbed patches moved to absorbed/ directories - 43 active patches verified clean against rebased sources - Stress test: base updated to upstream HEAD, relibc reset and patched Compilation fixes: - relibc: Vec imports in redox-rt (proc.rs, lib.rs, sys.rs) - relibc: unsafe from_raw_parts in mod.rs (2024 edition) - fetch.rs: rev comparison handles short/full hash prefixes - kibi recipe: corrected rev mismatch New scripts: restore-sources.sh, provision-release.sh, verify-sources-archived.sh, check-upstream-releases.sh, validate-source-trees.py, verify-patches.sh, repair-archive-format.sh, generate-manifest.py Documentation: AGENTS.md, README.md, local/AGENTS.md updated for release fork model
56 lines
1.9 KiB
Plaintext
56 lines
1.9 KiB
Plaintext
From: Red Bear OS
|
|
Date: 2026-04-28
|
|
Subject: daemon: handle missing INIT_NOTIFY gracefully instead of panicking
|
|
|
|
The Daemon::new() and Daemon::ready() functions in the daemon library
|
|
called unwrap() on the INIT_NOTIFY environment variable and the ready
|
|
pipe write, causing a hard panic when a daemon is started outside the
|
|
init system's notification pipe mechanism.
|
|
|
|
Replace unwrap() with graceful error handling:
|
|
- get_fd() returns -1 if the env var is missing or invalid, logging
|
|
a warning via eprintln
|
|
- ready() logs a warning on write failure instead of panicking
|
|
|
|
diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs
|
|
index 9f507221..a0ba9d88 100644
|
|
--- a/daemon/src/lib.rs
|
|
+++ b/daemon/src/lib.rs
|
|
@@ -11,12 +11,23 @@ use redox_scheme::Socket;
|
|
use redox_scheme::scheme::{SchemeAsync, SchemeSync};
|
|
|
|
unsafe fn get_fd(var: &str) -> RawFd {
|
|
- let fd: RawFd = std::env::var(var).unwrap().parse().unwrap();
|
|
+ let fd: RawFd = match std::env::var(var)
|
|
+ .map_err(|e| eprintln!("daemon: env var {var} not set: {e}"))
|
|
+ .ok()
|
|
+ .and_then(|val| {
|
|
+ val.parse()
|
|
+ .map_err(|e| eprintln!("daemon: failed to parse {var} as fd: {e}"))
|
|
+ .ok()
|
|
+ }) {
|
|
+ Some(fd) => fd,
|
|
+ None => return -1,
|
|
+ };
|
|
if unsafe { libc::fcntl(fd, libc::F_SETFD, libc::FD_CLOEXEC) } == -1 {
|
|
- panic!(
|
|
+ eprintln!(
|
|
"daemon: failed to set CLOEXEC flag for {var} fd: {}",
|
|
io::Error::last_os_error()
|
|
);
|
|
+ return -1;
|
|
}
|
|
fd
|
|
}
|
|
@@ -50,8 +61,10 @@ impl Daemon {
|
|
|
|
/// Notify the process that the daemon is ready to accept requests.
|
|
pub fn ready(mut self) {
|
|
- self.write_pipe.write_all(&[0]).unwrap();
|
|
+ if let Err(err) = self.write_pipe.write_all(&[0]) {
|
|
+ eprintln!("daemon::ready write failed: {err}");
|
|
+ }
|
|
}
|
|
|
|
/// Executes `Command` as a child process.
|