Use alternative XDG_RUNTIME_DIR

OSInside · Nov 22, 2024 · b7442f8 · b7442f8
1 parent 295946f
commit b7442f8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/common/src/container.rs b/common/src/container.rs
@@ -63,7 +63,8 @@ impl Container {
         let mut fix_run_storage = root.run("chown");
         fix_run_storage.arg("-R")
             .arg(chown_param)
-            .arg(format!("/run/user/{}/containers", user_id));
+            .arg(format!("/run/user/{}/containers", user_id))
+            .arg("/run/flakes");
         FlakeLog::debug(&format!("{:?}", fix_run_storage.get_args()));
         fix_run_storage.perform()?;
 

diff --git a/podman-pilot/registry/storage.conf b/podman-pilot/registry/storage.conf
@@ -1,5 +1,4 @@
 [storage]
 driver = "overlay"
 graphroot = "/usr/share/flakes/storage"
-runroot = "/var/tmp/containers/storage"
 rootless_storage_path = "/usr/share/flakes/storage"
diff --git a/podman-pilot/src/defaults.rs b/podman-pilot/src/defaults.rs
@@ -25,6 +25,7 @@
 pub const CONTAINER_DIR: &str = "/var/lib/containers";
 pub const GC_THRESHOLD: i32 = 20;
 pub const HOST_DEPENDENCIES: &str = "removed";
-pub const PODMAN_PATH:&str = "/usr/bin/podman";
-pub const FLAKES_STORAGE:&str = "/etc/flakes/storage.conf";
+pub const PODMAN_PATH: &str = "/usr/bin/podman";
+pub const FLAKES_STORAGE: &str = "/etc/flakes/storage.conf";
 pub const FLAKES_REGISTRY: &str = "/usr/share/flakes/storage";
+pub const FLAKES_REGISTRY_RUNROOT: &str = "/run/flakes";
diff --git a/podman-pilot/src/podman.rs b/podman-pilot/src/podman.rs
@@ -144,6 +144,13 @@ pub fn create(
         get_podman_ids_dir(), program_name, current_user.to_str().unwrap()
     );
 
+    let container_runroot = format!(
+        "{}/{}",
+        defaults::FLAKES_REGISTRY_RUNROOT, current_user.to_str().unwrap()
+    );
+
+    mkdir(&container_runroot, "777", User::ROOT)?;
+
     let mut app = user.run("podman");
     app.arg("create")
         .arg("--cidfile").arg(&container_cid_file);
@@ -152,6 +159,9 @@ pub fn create(
     init_cid_dir()?;
 
     env::set_var("CONTAINERS_STORAGE_CONF", defaults::FLAKES_STORAGE);
+    env::set_var("XDG_RUNTIME_DIR", &container_runroot);
+
+    let _ = Container::podman_setup_run_permissions();
 
     // Check early return condition in resume mode
     if Path::new(&container_cid_file).exists() && gc_cid_file(&container_cid_file, user)? && (resume || attach) {