Merge pull request #27 from slp/use-set-env

Use krun_set_env to set env vars when no command is configured

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "krunvm"
-version = "0.1.6"
+version = "0.2.0"
 authors = ["Sergio Lopez <[email protected]>"]
 description = "Create microVMs from OCI images"
 repository = "https://github.com/containers/krunvm"

src/bindings.rs

@@ -17,5 +17,6 @@ extern "C" {
         argv: *const *const i8,
         envp: *const *const i8,
     ) -> i32;
+    pub fn krun_set_env(ctx: u32, envp: *const *const i8) -> i32;
     pub fn krun_start_enter(ctx: u32) -> i32;
 }

src/start.rs

@@ -111,23 +111,21 @@ unsafe fn exec_vm(vmcfg: &VmConfig, rootfs: &str, cmd: Option<&str>, args: Vec<C
         }
     }
 
+    let hostname = CString::new(format!("HOSTNAME={}", vmcfg.name)).unwrap();
+    let home = CString::new("HOME=/root").unwrap();
+    let env: [*const i8; 3] = [
+        hostname.as_ptr() as *const i8,
+        home.as_ptr() as *const i8,
+        std::ptr::null(),
+    ];
+
     if let Some(cmd) = cmd {
         let mut argv: Vec<*const i8> = Vec::new();
         for a in args.iter() {
             argv.push(a.as_ptr() as *const i8);
         }
         argv.push(std::ptr::null());
 
-        let hostname = CString::new(format!("HOSTNAME={}", vmcfg.name)).unwrap();
-        let home = CString::new("HOME=/root").unwrap();
-        let path = CString::new("PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin").unwrap();
-        let env: [*const i8; 4] = [
-            hostname.as_ptr() as *const i8,
-            home.as_ptr() as *const i8,
-            path.as_ptr() as *const i8,
-            std::ptr::null(),
-        ];
-
         let c_cmd = CString::new(cmd).unwrap();
         let ret = bindings::krun_set_exec(
             ctx,
@@ -139,6 +137,12 @@ unsafe fn exec_vm(vmcfg: &VmConfig, rootfs: &str, cmd: Option<&str>, args: Vec<C
             println!("Error setting VM config");
             std::process::exit(-1);
         }
+    } else {
+        let ret = bindings::krun_set_env(ctx, env.as_ptr() as *const *const i8);
+        if ret < 0 {
+            println!("Error setting VM environment variables");
+            std::process::exit(-1);
+        }
     }
 
     let ret = bindings::krun_start_enter(ctx);