WIP: bootc install-to-filesystem fixes & composefs-backend

Author: Johan-Liebert1

crates/lib/Cargo.toml

@@ -73,7 +73,7 @@ similar-asserts = { workspace = true }
 static_assertions = { workspace = true }
 
 [features]
-default = ["install-to-disk"]
+default = ["install-to-disk", "composefs-backend"]
 # This feature enables `bootc install to-disk`, which is considered just a "demo"
 # or reference installer; we expect most nontrivial use cases to be using
 # `bootc install to-filesystem`.

crates/lib/src/bootc_composefs/repo.rs

@@ -49,7 +49,10 @@ pub(crate) async fn initialize_composefs_repository(
         &Arc::new(repo),
         &format!("{transport}{image_name}"),
         None,
-        None,
+        Some(ostree_ext::containers_image_proxy::ImageProxyConfig {
+            insecure_skip_tls_verification: Some(true),
+            ..Default::default()
+        }),
     )
     .await
 }

crates/lib/src/install.rs

@@ -372,6 +372,14 @@ pub(crate) struct InstallToFilesystemOpts {
 
     #[clap(flatten)]
     pub(crate) config_opts: InstallConfigOpts,
+
+    #[clap(long)]
+    #[cfg(feature = "composefs-backend")]
+    pub(crate) composefs_native: bool,
+
+    #[cfg(feature = "composefs-backend")]
+    #[clap(flatten)]
+    pub(crate) compoesfs_opts: InstallComposefsOpts,
 }
 
 #[derive(Debug, Clone, clap::Parser, PartialEq, Eq)]
@@ -993,6 +1001,7 @@ pub(crate) fn exec_in_host_mountns(args: &[std::ffi::OsString]) -> Result<()> {
     Err(Command::new(cmd).args(args).arg0(bootc_utils::NAME).exec()).context("exec")?
 }
 
+#[derive(Debug)]
 pub(crate) struct RootSetup {
     #[cfg(feature = "install-to-disk")]
     luks_device: Option<String>,
@@ -1536,6 +1545,9 @@ async fn install_to_filesystem_impl(
         }
     }
 
+    println!("state: {state:#?}");
+    println!("root_setup: {rootfs:#?}");
+
     #[cfg(feature = "composefs-backend")]
     if state.composefs_options.is_some() {
         // Load a fd for the mounted target physical root
@@ -1572,6 +1584,8 @@ pub(crate) async fn install_to_disk(mut opts: InstallToDiskOpts) -> Result<()> {
     #[cfg(feature = "composefs-backend")]
     opts.validate()?;
 
+    println!("install to disk opts: {opts:#?}");
+
     // Log the disk installation operation to systemd journal
     const INSTALL_DISK_JOURNAL_ID: &str = "8b7c6d5e4f3a2b1c0d9e8f7a6b5c4d3e2";
     let source_image = opts
@@ -1856,12 +1870,28 @@ pub(crate) async fn install_to_filesystem(
         target_path
     );
 
+    println!("opts: {opts:#?}");
+
     // Gather global state, destructuring the provided options.
     // IMPORTANT: We might re-execute the current process in this function (for SELinux among other things)
     // IMPORTANT: and hence anything that is done before MUST BE IDEMPOTENT.
     // IMPORTANT: In practice, we should only be gathering information before this point,
     // IMPORTANT: and not performing any mutations at all.
-    let state = prepare_install(opts.config_opts, opts.source_opts, opts.target_opts, None).await?;
+    let state = prepare_install(
+        opts.config_opts,
+        opts.source_opts,
+        opts.target_opts,
+        #[cfg(feature = "composefs-backend")]
+        if opts.composefs_native {
+            Some(opts.compoesfs_opts)
+        } else {
+            None
+        },
+        #[cfg(not(feature = "composefs-backend"))]
+        None,
+    )
+    .await?;
+
     // And the last bit of state here is the fsopts, which we also destructure now.
     let mut fsopts = opts.filesystem_opts;
 
@@ -2129,6 +2159,13 @@ pub(crate) async fn install_to_existing_root(opts: InstallToExistingRootOpts) ->
         source_opts: opts.source_opts,
         target_opts: opts.target_opts,
         config_opts: opts.config_opts,
+        #[cfg(feature = "composefs-backend")]
+        composefs_native: false,
+        #[cfg(feature = "composefs-backend")]
+        compoesfs_opts: InstallComposefsOpts {
+            insecure: false,
+            bootloader: Bootloader::Grub,
+        },
     };
 
     install_to_filesystem(opts, true, cleanup).await