ostree/usr-overlay: Check if an overlay already exists

Similar to what we have in the composefs path, check if there already
exists an overlay at `/usr`. This fixes the error in
`test-install-repart.nu` where a second install was failing for ostree
due to an overlay already existing on `/usr`

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/state.rs

@@ -329,7 +329,7 @@ pub(crate) async fn write_composefs_state(
 }
 
 pub(crate) fn composefs_usr_overlay(access_mode: FilesystemOverlayAccessMode) -> Result<()> {
-    let status = get_composefs_usr_overlay_status()?;
+    let status = get_usr_overlay_status()?;
     if status.is_some() {
         println!("An overlayfs is already mounted on /usr");
         return Ok(());
@@ -351,7 +351,7 @@ pub(crate) fn composefs_usr_overlay(access_mode: FilesystemOverlayAccessMode) ->
     Ok(())
 }
 
-pub(crate) fn get_composefs_usr_overlay_status() -> Result<Option<FilesystemOverlay>> {
+pub(crate) fn get_usr_overlay_status() -> Result<Option<FilesystemOverlay>> {
     let usr = Dir::open_ambient_dir("/usr", ambient_authority()).context("Opening /usr")?;
     let is_usr_mounted = usr
         .is_mountpoint(".")

crates/lib/src/bootc_composefs/status.rs

@@ -14,7 +14,7 @@ use crate::{
     bootc_composefs::{
         boot::BootType,
         selinux::are_selinux_policies_compatible,
-        state::{get_composefs_usr_overlay_status, read_origin},
+        state::{get_usr_overlay_status, read_origin},
         utils::{compute_store_boot_digest_for_uki, get_uki_cmdline},
     },
     composefs_consts::{
@@ -1059,7 +1059,7 @@ async fn composefs_deployment_status_from(
         host.spec.boot_order = BootOrder::Rollback
     };
 
-    host.status.usr_overlay = get_composefs_usr_overlay_status().ok().flatten();
+    host.status.usr_overlay = get_usr_overlay_status().ok().flatten();
 
     set_soft_reboot_capability(storage, &mut host, sorted_bls_config, cmdline)?;
 

crates/lib/src/cli.rs

@@ -41,6 +41,7 @@ use serde::{Deserialize, Serialize};
 use crate::bootc_composefs::delete::delete_composefs_deployment;
 use crate::bootc_composefs::gc::{GCOpts, composefs_gc};
 use crate::bootc_composefs::soft_reboot::{prepare_soft_reboot_composefs, reset_soft_reboot};
+use crate::bootc_composefs::state::get_usr_overlay_status;
 use crate::bootc_composefs::{
     digest::{compute_composefs_digest, new_temp_composefs_repo},
     finalize::{composefs_backend_finalize, get_etc_diff},
@@ -1664,6 +1665,12 @@ async fn edit(opts: EditOpts) -> Result<()> {
 
 /// Implementation of `bootc usroverlay`
 async fn usroverlay(access_mode: FilesystemOverlayAccessMode) -> Result<()> {
+    let status = get_usr_overlay_status()?;
+    if status.is_some() {
+        println!("An overlayfs is already mounted on /usr");
+        return Ok(());
+    }
+
     // This is just a pass-through today.  At some point we may make this a libostree API
     // or even oxidize it.
     let args = match access_mode {