composefs-backend: Rename 'composefs-native' to 'composefs-backend'

We were using composefs-native and composefs-backend interchangeably.
Replace all instances of `composefs-native` with `composefs-backend`

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

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/finalize.rs

@@ -39,7 +39,7 @@ pub(crate) async fn get_etc_diff() -> Result<()> {
     Ok(())
 }
 
-pub(crate) async fn composefs_native_finalize() -> Result<()> {
+pub(crate) async fn composefs_backend_finalize() -> Result<()> {
     let host = composefs_deployment_status().await?;
 
     let booted_composefs = host.require_composefs_booted()?;

crates/lib/src/cli.rs

@@ -31,7 +31,7 @@ use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "composefs-backend")]
 use crate::bootc_composefs::{
-    finalize::{composefs_native_finalize, get_etc_diff},
+    finalize::{composefs_backend_finalize, get_etc_diff},
     rollback::composefs_rollback,
     state::composefs_usr_overlay,
     status::composefs_booted,
@@ -1544,7 +1544,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
         },
 
         #[cfg(feature = "composefs-backend")]
-        Opt::ComposefsFinalizeStaged => composefs_native_finalize().await,
+        Opt::ComposefsFinalizeStaged => composefs_backend_finalize().await,
 
         #[cfg(feature = "composefs-backend")]
         Opt::ConfigDiff => get_etc_diff().await,

crates/lib/src/composefs_consts.rs

@@ -8,9 +8,9 @@ pub(crate) const COMPOSEFS_TRANSIENT_STATE_DIR: &str = "/run/composefs";
 /// File created in /run/composefs to record a staged-deployment
 pub(crate) const COMPOSEFS_STAGED_DEPLOYMENT_FNAME: &str = "staged-deployment";
 
-/// Absolute path to composefs-native state directory
+/// Absolute path to composefs-backend state directory
 pub(crate) const STATE_DIR_ABS: &str = "/sysroot/state/deploy";
-/// Relative path to composefs-native state directory. Relative to /sysroot
+/// Relative path to composefs-backend state directory. Relative to /sysroot
 pub(crate) const STATE_DIR_RELATIVE: &str = "state/deploy";
 /// Relative path to the shared 'var' directory. Relative to /sysroot
 pub(crate) const SHARED_VAR_PATH: &str = "state/os/default/var";

crates/lib/src/install.rs

@@ -249,10 +249,21 @@ pub(crate) struct InstallConfigOpts {
 
 #[derive(Debug, Clone, clap::Parser, Serialize, Deserialize, PartialEq, Eq)]
 pub(crate) struct InstallComposefsOpts {
+    /// If true, composefs backend is used, else ostree backend is used
+    #[clap(long, default_value_t)]
+    #[serde(default)]
+    pub(crate) composefs_backend: bool,
+
+    /// Make fs-verity validation optional in case the filesystem doesn't support it
     #[clap(long, default_value_t)]
     #[serde(default)]
     pub(crate) insecure: bool,
 
+    /// The bootloader to use.
+    /// Currently supported:
+    ///
+    /// - systemd-boot
+    /// - grub
     #[clap(long, default_value_t)]
     #[serde(default)]
     pub(crate) bootloader: Bootloader,
@@ -288,11 +299,6 @@ pub(crate) struct InstallToDiskOpts {
     #[serde(default)]
     pub(crate) via_loopback: bool,
 
-    #[clap(long)]
-    #[serde(default)]
-    #[cfg(feature = "composefs-backend")]
-    pub(crate) composefs_native: bool,
-
     #[clap(flatten)]
     #[serde(flatten)]
     #[cfg(feature = "composefs-backend")]
@@ -373,10 +379,6 @@ 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,
@@ -446,7 +448,7 @@ pub(crate) struct State {
     pub(crate) container_root: Dir,
     pub(crate) tempdir: TempDir,
 
-    // If Some, then --composefs_native is passed
+    // If Some, then --composefs-backend is passed
     #[cfg(feature = "composefs-backend")]
     pub(crate) composefs_options: Option<InstallComposefsOpts>,
 }
@@ -578,10 +580,10 @@ impl FromStr for MountSpec {
 #[cfg(all(feature = "install-to-disk", feature = "composefs-backend"))]
 impl InstallToDiskOpts {
     pub(crate) fn validate(&self) -> Result<()> {
-        if !self.composefs_native {
-            // Reject using --insecure without --composefs
+        if !self.composefs_opts.composefs_backend {
+            // Reject using --insecure without --composefs-backend
             if self.composefs_opts.insecure != false {
-                anyhow::bail!("--insecure must not be provided without --composefs");
+                anyhow::bail!("--insecure must not be provided without --composefs-backend");
             }
         }
 
@@ -1623,7 +1625,7 @@ pub(crate) async fn install_to_disk(mut opts: InstallToDiskOpts) -> Result<()> {
     }
 
     #[cfg(feature = "composefs-backend")]
-    let composefs_arg = if opts.composefs_native {
+    let composefs_arg = if opts.composefs_opts.composefs_backend {
         Some(opts.composefs_opts)
     } else {
         None
@@ -1874,7 +1876,9 @@ pub(crate) async fn install_to_filesystem(
         opts.source_opts,
         opts.target_opts,
         #[cfg(feature = "composefs-backend")]
-        opts.composefs_native.then_some(opts.compoesfs_opts),
+        opts.compoesfs_opts
+            .composefs_backend
+            .then_some(opts.compoesfs_opts),
         #[cfg(not(feature = "composefs-backend"))]
         None,
     )
@@ -2148,9 +2152,8 @@ pub(crate) async fn install_to_existing_root(opts: InstallToExistingRootOpts) ->
         target_opts: opts.target_opts,
         config_opts: opts.config_opts,
         #[cfg(feature = "composefs-backend")]
-        composefs_native: false,
-        #[cfg(feature = "composefs-backend")]
         compoesfs_opts: InstallComposefsOpts {
+            composefs_backend: true,
             insecure: false,
             bootloader: Bootloader::Grub,
             uki_addon: None,

tmt/tests/examples/bootc-uki/install-grub.sh

@@ -19,7 +19,7 @@ podman run \
     --security-opt label=type:unconfined_t \
     "${IMAGE}" \
     bootc install to-disk \
-        --composefs-native \
+        --composefs-backend \
         --boot=uki \
         --source-imgref="containers-storage:${IMAGE}" \
         --target-imgref="${IMAGE}" \

tmt/tests/examples/bootc-uki/install-systemd-boot.sh

@@ -24,7 +24,7 @@ podman run \
     --security-opt label=type:unconfined_t \
     "${IMAGE}" \
     bootc install to-disk \
-        --composefs-native \
+        --composefs-backend \
         --boot=uki \
         --source-imgref="containers-storage:${IMAGE}" \
         --target-imgref="${IMAGE}" \