[pull] main from bootc-dev:main

crates/lib/src/bootc_composefs/state.rs

@@ -246,7 +246,11 @@ pub(crate) fn composefs_usr_overlay() -> Result<()> {
         return Ok(());
     }
 
-    overlay_transient(usr, Some(0o755.into()))?;
+    // Get the mode from the underlying /usr directory
+    let usr_metadata = usr.metadata(".").context("Getting /usr metadata")?;
+    let usr_mode = Mode::from_raw_mode(usr_metadata.permissions().mode());
+
+    overlay_transient(usr, Some(usr_mode))?;
 
     println!("A writeable overlayfs is now mounted on /usr");
     println!("All changes there will be discarded on reboot.");

crates/lib/src/bootc_composefs/update.rs

@@ -266,6 +266,11 @@ pub(crate) async fn upgrade_composefs(
     storage: &Storage,
     composefs: &BootedComposefs,
 ) -> Result<()> {
+    // Download-only mode is not yet supported for composefs backend
+    if opts.download_only {
+        anyhow::bail!("--download-only is not yet supported for composefs backend");
+    }
+
     let host = get_composefs_status(storage, composefs)
         .await
         .context("Getting composefs deployment status")?;