system-reinstall: Add composefs-backend option

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

Author: Johan-Liebert1

crates/system-reinstall-bootc/src/config/mod.rs

@@ -15,6 +15,7 @@ const CONFIG_VAR: &str = "BOOTC_REINSTALL_CONFIG";
 pub(crate) struct ReinstallConfig {
     /// The bootc image to install on the system.
     pub(crate) bootc_image: String,
+    pub(crate) composefs_backend: bool,
 }
 
 impl ReinstallConfig {

crates/system-reinstall-bootc/src/main.rs

@@ -24,23 +24,26 @@ const ROOT_KEY_MOUNT_POINT: &str = "/bootc_authorized_ssh_keys/root";
 /// file with a single member `bootc_image` that specifies the image to install.
 /// This will take precedence over the CLI.
 #[derive(clap::Parser)]
-struct Opts {
+pub(crate) struct ReinstallOpts {
     /// The bootc image to install
     pub(crate) image: String,
     // Note if we ever add any other options here,
+    #[arg(long)]
+    pub(crate) composefs_backend: bool,
 }
 
 #[context("run")]
 fn run() -> Result<()> {
     // We historically supported an environment variable providing a config to override the image, so
     // keep supporting that. I'm considering deprecating that though.
     let opts = if let Some(config) = config::ReinstallConfig::load().context("loading config")? {
-        Opts {
+        ReinstallOpts {
             image: config.bootc_image,
+            composefs_backend: config.composefs_backend,
         }
     } else {
         // Otherwise an image is required.
-        Opts::parse()
+        ReinstallOpts::parse()
     };
 
     bootc_utils::initialize_tracing();
@@ -68,7 +71,7 @@ fn run() -> Result<()> {
 
     prompt::mount_warning()?;
 
-    let mut reinstall_podman_command = podman::reinstall_command(&opts.image, ssh_key_file_path)?;
+    let mut reinstall_podman_command = podman::reinstall_command(&opts, ssh_key_file_path)?;
 
     println!();
     println!("Going to run command:");

crates/system-reinstall-bootc/src/podman.rs

@@ -1,4 +1,4 @@
-use crate::prompt;
+use crate::{prompt, ReinstallOpts};
 
 use super::ROOT_KEY_MOUNT_POINT;
 use anyhow::{ensure, Context, Result};
@@ -25,7 +25,7 @@ fn bootc_has_clean(image: &str) -> Result<bool> {
 }
 
 #[context("reinstall_command")]
-pub(crate) fn reinstall_command(image: &str, ssh_key_file: &str) -> Result<Command> {
+pub(crate) fn reinstall_command(opts: &ReinstallOpts, ssh_key_file: &str) -> Result<Command> {
     let mut podman_command_and_args = [
         // We use podman to run the bootc container. This might change in the future to remove the
         // podman dependency.
@@ -72,11 +72,15 @@ pub(crate) fn reinstall_command(image: &str, ssh_key_file: &str) -> Result<Comma
     .map(String::from)
     .to_vec();
 
+    if opts.composefs_backend {
+        bootc_command_and_args.push("--composefs-backend".into());
+    }
+
     // Enable the systemd service to cleanup the previous install after booting into the
     // bootc system for the first time.
     // This only happens if the bootc version in the image >= 1.1.8 (this is when the cleanup
     // feature was introduced)
-    if bootc_has_clean(image)? {
+    if bootc_has_clean(&opts.image)? {
         bootc_command_and_args.push("--cleanup".to_string());
     }
 
@@ -88,7 +92,7 @@ pub(crate) fn reinstall_command(image: &str, ssh_key_file: &str) -> Result<Comma
 
     let all_args = [
         podman_command_and_args,
-        vec![image.to_string()],
+        vec![opts.image.to_string()],
         bootc_command_and_args,
     ]
     .concat();