storage: Fix premature ostree booted check

There were a few checks that asserted ostree booted system even for
systems booted via composefs. Move the checks in `Storage::new`

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/lib/src/cli.rs

@@ -715,7 +715,6 @@ pub(crate) fn ensure_self_unshared_mount_namespace() -> Result<()> {
 /// Load global storage state, expecting that we're booted into a bootc system.
 #[context("Initializing storage")]
 pub(crate) async fn get_storage() -> Result<crate::store::BootedStorage> {
-    prepare_for_write()?;
     BootedStorage::new().await
 }
 
@@ -842,7 +841,7 @@ fn soft_reboot_rollback(booted_ostree: &BootedOstree<'_>) -> Result<()> {
 /// IMPORTANT: This may end up re-executing the current process,
 /// so anything that happens before this should be idempotent.
 #[context("Preparing for write")]
-fn prepare_for_write() -> Result<()> {
+pub(crate) fn prepare_for_write() -> Result<()> {
     use std::sync::atomic::{AtomicBool, Ordering};
 
     // This is intending to give "at most once" semantics to this

crates/lib/src/status.rs

@@ -10,7 +10,6 @@ use fn_error_context::context;
 use ostree::glib;
 use ostree_container::OstreeImageReference;
 use ostree_ext::container as ostree_container;
-use ostree_ext::container_utils::ostree_booted;
 use ostree_ext::keyfileext::KeyFileExt;
 use ostree_ext::oci_spec;
 use ostree_ext::oci_spec::image::Digest;
@@ -368,19 +367,16 @@ pub(crate) fn get_status(
 }
 
 async fn get_host() -> Result<Host> {
-    let host = if ostree_booted()? {
-        let storage = super::cli::get_storage().await?;
-        match storage.kind()? {
-            crate::store::BootedStorageKind::Ostree(booted_ostree) => {
-                let (_deployments, host) = get_status(&booted_ostree)?;
-                host
-            }
-            crate::store::BootedStorageKind::Composefs(booted_cfs) => {
-                crate::bootc_composefs::status::get_composefs_status(&storage, &booted_cfs).await?
-            }
+    let storage = super::cli::get_storage().await?;
+
+    let host = match storage.kind()? {
+        crate::store::BootedStorageKind::Ostree(booted_ostree) => {
+            let (_deployments, host) = get_status(&booted_ostree)?;
+            host
+        }
+        crate::store::BootedStorageKind::Composefs(booted_cfs) => {
+            crate::bootc_composefs::status::get_composefs_status(&storage, &booted_cfs).await?
         }
-    } else {
-        Default::default()
     };
 
     Ok(host)

crates/lib/src/store/mod.rs

@@ -31,6 +31,7 @@ use ostree_ext::{gio, ostree};
 use rustix::fs::Mode;
 
 use crate::bootc_composefs::status::{composefs_booted, ComposefsCmdline};
+use crate::cli::prepare_for_write;
 use crate::lsm;
 use crate::podstorage::CStorage;
 use crate::spec::ImageStatus;
@@ -111,11 +112,12 @@ impl BootedStorage {
     pub(crate) async fn new() -> Result<Self> {
         let physical_root = Dir::open_ambient_dir("/sysroot", cap_std::ambient_authority())
             .context("Opening /sysroot")?;
+
         let run =
             Dir::open_ambient_dir("/run", cap_std::ambient_authority()).context("Opening /run")?;
+
         if let Some(cmdline) = composefs_booted()? {
-            let mut composefs =
-                ComposefsRepository::open_path(physical_root.open_dir(COMPOSEFS)?, ".")?;
+            let mut composefs = ComposefsRepository::open_path(&physical_root, COMPOSEFS)?;
             if cmdline.insecure {
                 composefs.set_insecure(true);
             }
@@ -128,24 +130,26 @@ impl BootedStorage {
                 composefs: OnceCell::from(composefs),
                 imgstore: Default::default(),
             };
-            Ok(Self { storage })
-        } else {
-            let sysroot = ostree::Sysroot::new_default();
-            sysroot.set_mount_namespace_in_use();
-            let sysroot = ostree_ext::sysroot::SysrootLock::new_from_sysroot(&sysroot).await?;
-            sysroot.load(gio::Cancellable::NONE)?;
-            // Verify this is a booted system
-            let _ = sysroot.require_booted_deployment()?;
 
-            let storage = Storage {
-                physical_root,
-                run,
-                ostree: OnceCell::from(sysroot),
-                composefs: Default::default(),
-                imgstore: Default::default(),
-            };
-            Ok(Self { storage })
+            return Ok(Self { storage });
         }
+
+        prepare_for_write()?;
+
+        let sysroot = ostree::Sysroot::new_default();
+        sysroot.set_mount_namespace_in_use();
+        let sysroot = ostree_ext::sysroot::SysrootLock::new_from_sysroot(&sysroot).await?;
+        sysroot.load(gio::Cancellable::NONE)?;
+
+        let storage = Storage {
+            physical_root,
+            run,
+            ostree: OnceCell::from(sysroot),
+            composefs: Default::default(),
+            imgstore: Default::default(),
+        };
+
+        Ok(Self { storage })
     }
 
     /// Determine the boot storage backend kind.