muvm-guest: pass config to split remote process

Signed-off-by: Val Packett <[email protected]>

Author: valpackett

crates/muvm/src/bin/muvm.rs

@@ -478,9 +478,19 @@ fn main() -> Result<ExitCode> {
 
     let krun_config_env = CString::new(format!("KRUN_CONFIG={}", config_file.path().display()))
         .context("Failed to process config_file var as it contains NUL character")?;
+    #[allow(unused_assignments)] // wat?
+    let mut muvm_config_env = None; // keep in this scope
     let mut env: Vec<*const c_char> = vec![krun_config_env.as_ptr()];
     if custom_init {
         env.push(c"KRUN_INIT_PID1=1".as_ptr());
+        muvm_config_env = Some(
+            CString::new(format!(
+                "MUVM_REMOTE_CONFIG={}",
+                muvm_config_file.path().display()
+            ))
+            .context("Failed to process internal config path as it contains NUL character")?,
+        );
+        env.push(muvm_config_env.as_ref().unwrap().as_ptr());
     }
     env.push(std::ptr::null());
 

crates/muvm/src/guest/bin/muvm-guest.rs

@@ -2,7 +2,6 @@ use std::fs::File;
 use std::io::Read;
 use std::os::fd::AsFd;
 use std::panic::catch_unwind;
-use std::path::PathBuf;
 use std::process::{Command, ExitCode};
 use std::{cmp, env, fs, thread};
 
@@ -26,16 +25,32 @@ use rustix::process::{getrlimit, setrlimit, Resource};
 
 const KRUN_CONFIG: &str = "KRUN_CONFIG";
 
+fn parse_config(config_path: String) -> Result<GuestConfiguration> {
+    let mut config_file = File::open(&config_path)?;
+    let mut config_buf = Vec::new();
+    config_file.read_to_end(&mut config_buf)?;
+    fs::remove_file(config_path).context("Unable to delete temporary muvm configuration file")?;
+    if let Ok(krun_config_path) = env::var(KRUN_CONFIG) {
+        fs::remove_file(krun_config_path)
+            .context("Unable to delete temporary krun configuration file")?;
+        // SAFETY: We are single-threaded at this point
+        env::remove_var(KRUN_CONFIG);
+    }
+    // SAFETY: We are single-threaded at this point
+    env::remove_var("KRUN_WORKDIR");
+    Ok(serde_json::from_slice::<GuestConfiguration>(&config_buf)?)
+}
+
 fn main() -> Result<ExitCode> {
     env_logger::init();
 
     let binary_path = env::args().next().context("arg0")?;
     let bb = binary_path.split('/').next_back().context("arg0 split")?;
     match bb {
-        "muvm-configure-network" => return configure_network(),
+        "muvm-configure-network" => return configure_network().map(|()| ExitCode::SUCCESS),
         "muvm-pwbridge" => {
             bridge_loop_with_listenfd::<PipeWireProtocolHandler>(pipewire_sock_path);
-            return Ok(());
+            return Ok(ExitCode::SUCCESS);
         },
         "muvm-x11bridge" => {
             bridge_loop_with_listenfd::<X11ProtocolHandler>(|| "/tmp/.X11-unix/X1".to_owned());
@@ -51,9 +66,13 @@ fn main() -> Result<ExitCode> {
         },
         "muvm-remote" => {
             let rt = tokio::runtime::Runtime::new().unwrap();
-            let mut command_args = env::args().skip(1);
-            let command = command_args.next().context("command name")?;
-            return rt.block_on(server_main(PathBuf::from(command), command_args.collect()));
+            let config_path =
+                env::var("MUVM_REMOTE_CONFIG").context("expected MUVM_REMOTE_CONFIG to be set")?;
+            let options = parse_config(config_path)?;
+            return rt.block_on(server_main(
+                options.command.command,
+                options.command.command_args,
+            ));
         },
         _ => { /* continue with all-in-one mode */ },
     }
@@ -66,19 +85,7 @@ fn main() -> Result<ExitCode> {
     let config_path = env::args()
         .nth(1)
         .context("expected configuration file path")?;
-    let mut config_file = File::open(&config_path)?;
-    let mut config_buf = Vec::new();
-    config_file.read_to_end(&mut config_buf)?;
-    fs::remove_file(config_path).context("Unable to delete temporary muvm configuration file")?;
-    if let Ok(krun_config_path) = env::var(KRUN_CONFIG) {
-        fs::remove_file(krun_config_path)
-            .context("Unable to delete temporary krun configuration file")?;
-        // SAFETY: We are single-threaded at this point
-        env::remove_var(KRUN_CONFIG);
-    }
-    // SAFETY: We are single-threaded at this point
-    env::remove_var("KRUN_WORKDIR");
-    let options = serde_json::from_slice::<GuestConfiguration>(&config_buf)?;
+    let options = parse_config(config_path)?;
 
     {
         const ESYNC_RLIMIT_NOFILE: u64 = 524288;