feat(hostd): varlink interfaced host controller to manage machine configuration and boot mgmt

Cargo.lock

@@ -993,7 +993,8 @@ name = "hostd"
 version = "0.2.0"
 dependencies = [
  "anyhow",
- "internal",
+ "ipc",
+ "systemd-ipc",
  "varlink",
 ]
 
@@ -1354,7 +1355,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "internal"
+name = "ipc"
 version = "0.2.0"
 dependencies = [
  "serde",
@@ -3129,6 +3130,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "systemd-ipc"
+version = "0.2.0"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "varlink",
+ "varlink_generator",
+ "walkdir",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"

Cargo.toml

@@ -7,7 +7,8 @@ members = [
   "hostd",
   "trace-request",
   "xtask",
-  "internal",
+  "ipc",
+  "systemd-ipc",
 ]
 default-members = [
   "agent",

hostd/Cargo.toml

@@ -6,4 +6,5 @@ edition.workspace = true
 [dependencies]
 anyhow.workspace = true
 varlink = "11.0.1"
-internal = { path = "../internal" }
+ipc = { path = "../ipc" }
+systemd-ipc = { path = "../systemd-ipc" }

hostd/src/main.rs

@@ -1,10 +1,8 @@
 use anyhow::Result;
 
-use internal::ipc::patagia::io_patagia_hostd;
-use internal::ipc::systemd::io_systemd_hostname::{self, VarlinkClientInterface};
-
-const LISTEN_ADDRESS: &str = "unix:/tmp/patagia/io.patagia.hostd";
-const SYSTEMD_ADDRESS: &str = "unix:/run/systemd/io.systemd.Hostname";
+use ipc::io_patagia_hostd;
+use systemd_ipc::addrs::SYSTEMD_HOSTNAME;
+use systemd_ipc::io_systemd_hostname::{self, VarlinkClientInterface};
 
 struct PatagiaHostd;
 
@@ -21,7 +19,7 @@ impl io_patagia_hostd::VarlinkInterface for PatagiaHostd {
 
     fn describe(&self, call: &mut dyn io_patagia_hostd::Call_Describe) -> varlink::Result<()> {
         // Connect to systemd.Hostname
-        let conn = varlink::Connection::with_address(SYSTEMD_ADDRESS).unwrap();
+        let conn = varlink::Connection::with_address(SYSTEMD_HOSTNAME).unwrap();
         let mut sd = io_systemd_hostname::VarlinkClient::new(conn);
 
         let machine = io_patagia_hostd::Machine {
@@ -45,20 +43,14 @@ fn main() -> Result<()> {
         vec![Box::new(hostd_iface)],
     );
 
-    let addr_path = std::path::Path::new(LISTEN_ADDRESS.strip_prefix("unix:").unwrap())
-        .parent()
-        .unwrap();
+    let addr = format!("unix:{}/{}", env!("XDG_RUNTIME_DIR"), "io.patagia.hostd");
 
-    std::fs::create_dir_all(addr_path)?;
-
-    println!("Varlink Listening on {}", LISTEN_ADDRESS);
+    println!("Varlink Listening on {}", addr);
 
     varlink::listen(
         svc,
-        LISTEN_ADDRESS,
+        &addr,
         &varlink::ListenConfig {
-            // Listen forever (0 = forever)
-            idle_timeout: 0,
             ..Default::default()
         },
     )?;

internal/src/ipc/mod.rs

@@ -1,2 +0,0 @@
-pub mod patagia;
-pub mod systemd;

internal/src/lib.rs

@@ -1 +0,0 @@
-pub mod ipc;

ipc/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "internal"
+name = "ipc"
 version.workspace = true
 edition.workspace = true
 

systemd-ipc/.gitignore

@@ -0,0 +1 @@
+/target

systemd-ipc/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "systemd-ipc"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+serde.workspace = true
+serde_derive = "1.0.217"
+serde_json = "1.0.135"
+varlink = "11.0.1"
+
+[build-dependencies]
+varlink_generator = "10.1.0"
+walkdir = "2.5.0"
+
+[package.metadata.cargo-machete]
+ignored = ["serde"]

systemd-ipc/build.rs

@@ -0,0 +1,12 @@
+extern crate varlink_generator;
+
+use walkdir::WalkDir;
+
+fn main() {
+    // walk dir to find varlink files
+    for entry in WalkDir::new("src").into_iter().filter_map(|e| e.ok()) {
+        if entry.file_name().to_str().unwrap().ends_with(".varlink") {
+            varlink_generator::cargo_build_tosource(&entry.path().display().to_string(), true);
+        }
+    }
+}

systemd-ipc/src/addrs.rs

@@ -0,0 +1,2 @@
+#[allow(dead_code)]
+pub const SYSTEMD_HOSTNAME: &str = "unix:/run/systemd/io.systemd.Hostname";

systemd-ipc/src/lib.rs

@@ -1 +1,2 @@
+pub mod addrs;
 pub mod io_systemd_hostname;