store: add BOOTC_ROOT

Also refactor imgstore to base its subpath to be relative to
BOOTC_ROOT.  This is prep for store::Storage to update the mtime on
BOOTC_ROOT.

Signed-off-by: John Eckersberg <[email protected]>

Author: jeckersb

lib/src/imgstorage.rs

@@ -13,7 +13,7 @@ use std::sync::Arc;
 
 use anyhow::{Context, Result};
 use bootc_utils::{AsyncCommandRunExt, CommandRunExt, ExitStatusExt};
-use camino::Utf8Path;
+use camino::Utf8PathBuf;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::Dir;
 use cap_std_ext::cap_tempfile::TempDir;
@@ -35,8 +35,8 @@ pub(crate) const STORAGE_ALIAS_DIR: &str = "/run/bootc/storage";
 /// We pass this via /proc/self/fd to the child process.
 const STORAGE_RUN_FD: i32 = 3;
 
-/// The path to the storage, relative to the physical system root.
-pub(crate) const SUBPATH: &str = "ostree/bootc/storage";
+/// The path to the image storage, relative to the bootc root directory.
+pub(crate) const SUBPATH: &str = "storage";
 /// The path to the "runroot" with transient runtime state; this is
 /// relative to the /run directory
 const RUNROOT: &str = "bootc/storage";
@@ -139,14 +139,15 @@ impl Storage {
     #[context("Creating imgstorage")]
     pub(crate) fn create(sysroot: &Dir, run: &Dir) -> Result<Self> {
         Self::init_globals()?;
-        let subpath = Utf8Path::new(SUBPATH);
+        let subpath = Self::subpath();
+
         // SAFETY: We know there's a parent
         let parent = subpath.parent().unwrap();
         if !sysroot
-            .try_exists(subpath)
+            .try_exists(&subpath)
             .with_context(|| format!("Querying {subpath}"))?
         {
-            let tmp = format!("{SUBPATH}.tmp");
+            let tmp = format!("{subpath}.tmp");
             sysroot.remove_all_optional(&tmp).context("Removing tmp")?;
             sysroot
                 .create_dir_all(parent)
@@ -163,7 +164,7 @@ impl Storage {
                 .context("Initializing images")?;
             drop(storage_root);
             sysroot
-                .rename(&tmp, sysroot, subpath)
+                .rename(&tmp, sysroot, &subpath)
                 .context("Renaming tmpdir")?;
             tracing::debug!("Created image store");
         }
@@ -174,9 +175,10 @@ impl Storage {
     pub(crate) fn open(sysroot: &Dir, run: &Dir) -> Result<Self> {
         tracing::trace!("Opening container image store");
         Self::init_globals()?;
+        let subpath = Self::subpath();
         let storage_root = sysroot
-            .open_dir(SUBPATH)
-            .with_context(|| format!("Opening {SUBPATH}"))?;
+            .open_dir(&subpath)
+            .with_context(|| format!("Opening {subpath}"))?;
         // Always auto-create this if missing
         run.create_dir_all(RUNROOT)
             .with_context(|| format!("Creating {RUNROOT}"))?;
@@ -303,6 +305,10 @@ impl Storage {
         temp_runroot.close()?;
         Ok(())
     }
+
+    fn subpath() -> Utf8PathBuf {
+        [crate::store::BOOTC_ROOT, SUBPATH].iter().collect()
+    }
 }
 
 #[cfg(test)]

lib/src/store/mod.rs

@@ -15,6 +15,10 @@ use crate::spec::ImageStatus;
 
 mod ostree_container;
 
+/// The path to the bootc root directory, relative to the physical
+/// system root
+pub(crate) const BOOTC_ROOT: &str = "ostree/bootc";
+
 pub(crate) struct Storage {
     pub sysroot: SysrootLock,
     run: Dir,