vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

rename(162): role badge manager -> root, update hm1nd comment

Browse source
This commit is contained in:
damocles 2026-06-01 16:59:27 +02:00 • committed by mara
commit 4c2398a38e
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hive-c0re/src/manager_server.rs
View file

@ -23,7 +23,7 @@ pub fn start(coord: Arc<Coordinator>) -> Result<()> {
} }
let listener = UnixListener::bind(&socket) let listener = UnixListener::bind(&socket)
.with_context(|| format!("bind manager socket {}", socket.display()))?; .with_context(|| format!("bind manager socket {}", socket.display()))?;
// 0666 so the in-container hm1nd user (non-root) can connect; // 0666 so the in-container root user (non-root) can connect;
// the bind source dir is manager-only on host. See agent_server.rs. // the bind source dir is manager-only on host. See agent_server.rs.
use std::os::unix::fs::PermissionsExt as _; use std::os::unix::fs::PermissionsExt as _;
std::fs::set_permissions(&socket, std::fs::Permissions::from_mode(0o666)) std::fs::set_permissions(&socket, std::fs::Permissions::from_mode(0o666))
@ -404,11 +404,9 @@ async fn dispatch(req: &ManagerRequest, coord: &Arc<Coordinator>) -> ManagerResp
let n = lines.unwrap_or(50); let n = lines.unwrap_or(50);
// `journalctl -M` wants the *machine* name, not the // `journalctl -M` wants the *machine* name, not the
// logical agent name: `gui` → `h-gui`. `container_name` // logical agent name: `gui` → `h-gui`. `container_name`
// does that and passes `hm1nd` through unprefixed — but // does that and passes the manager name through unprefixed.
// it doesn't know the broker-logical manager name // The explicit check here keeps parity with the MANAGER_AGENT
// `"manager"` (it'd wrongly produce `h-manager`), so // constant so the two never diverge.
// handle that alias explicitly. Either manager spelling
// resolves to the unprefixed `hm1nd` machine.
let machine = if agent == MANAGER_AGENT { let machine = if agent == MANAGER_AGENT {
crate::lifecycle::MANAGER_NAME.to_owned() crate::lifecycle::MANAGER_NAME.to_owned()
} else { } else {
@ -541,7 +539,7 @@ async fn dispatch(req: &ManagerRequest, coord: &Arc<Coordinator>) -> ManagerResp
let (status_text, status_set_at, running) = let (status_text, status_set_at, running) =
crate::container_view::read_agent_status_live(target).await; crate::container_view::read_agent_status_live(target).await;
let role = if target == MANAGER_AGENT { let role = if target == MANAGER_AGENT {
"manager" "root"
} else { } else {
"agent" "agent"
} }