Merge pull request bootc-dev#1550 from Johan-Liebert1/composefs-initramfs

Move composefs setup root to bootc initramfs

Author: cgwalters

Cargo.lock

@@ -65,6 +65,7 @@ tokio-util = { features = ["io-util"], version = "0.7.10" }
 toml = "0.9.5"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-journald = "0.3.1"
 uzers = "0.12"
 xshell = "0.2.6"
 

Cargo.toml

@@ -7,6 +7,17 @@ publish = false
 
 [dependencies]
 anyhow.workspace = true
+clap = { workspace = true, features = ["std", "help", "usage", "derive"] }
+rustix.workspace = true
+serde = { workspace = true, features = ["derive"] }
+composefs.workspace = true
+composefs-boot.workspace = true
+toml.workspace = true
 
 [lints]
 workspace = true
+
+[features]
+default = ['pre-6.15']
+rhel9 = ['composefs/rhel9']
+'pre-6.15' = ['composefs/pre-6.15']

crates/initramfs/Cargo.toml

@@ -2,8 +2,7 @@
 Description=bootc setup root
 Documentation=man:bootc(1)
 DefaultDependencies=no
-# For now
-ConditionKernelCommandLine=ostree
+ConditionKernelCommandLine=composefs
 ConditionPathExists=/etc/initrd-release
 After=sysroot.mount
 After=ostree-prepare-root.service

crates/initramfs/bootc-root-setup.service

@@ -1,24 +1,15 @@
 //! Code for bootc that goes into the initramfs.
-//! At the current time, this is mostly just a no-op.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
+mod mount;
+
 use anyhow::Result;
 
-fn setup_root() -> Result<()> {
-    let _ = std::fs::metadata("/sysroot/usr")?;
-    println!("setup OK");
-    Ok(())
-}
+use clap::Parser;
+use mount::{gpt_workaround, setup_root, Args};
 
 fn main() -> Result<()> {
-    let v = std::env::args().collect::<Vec<_>>();
-    let args = match v.as_slice() {
-        [] => anyhow::bail!("Missing argument".to_string()),
-        [_, rest @ ..] => rest,
-    };
-    match args {
-        [] => anyhow::bail!("Missing argument".to_string()),
-        [s] if s == "setup-root" => setup_root(),
-        [o, ..] => anyhow::bail!(format!("Unknown command {o}")),
-    }
+    let args = Args::parse();
+    gpt_workaround()?;
+    setup_root(args)
 }