reset: Move kernel code into bootc_kargs

Also cleans up some bugs from rebasing previous commits.

Author: ckyrouac

crates/lib/src/bootc_kargs.rs

@@ -19,6 +19,13 @@ use crate::store::Storage;
 /// The relative path to the kernel arguments which may be embedded in an image.
 const KARGS_PATH: &str = "usr/lib/bootc/kargs.d";
 
+/// The default root filesystem mount specification.
+pub(crate) const ROOT: &str = "root=";
+/// This is used by dracut.
+pub(crate) const INITRD_ARG_PREFIX: &str = "rd.";
+/// The kernel argument for configuring the rootfs flags.
+pub(crate) const ROOTFLAGS: &str = "rootflags=";
+
 /// The kargs.d configuration file.
 #[derive(Deserialize)]
 #[serde(rename_all = "kebab-case", deny_unknown_fields)]
@@ -54,6 +61,18 @@ pub(crate) fn get_kargs_in_root(d: &Dir, sys_arch: &str) -> Result<Vec<String>>
     Ok(ret)
 }
 
+pub(crate) fn root_args_from_cmdline<'a>(cmdline: &'a [&str]) -> Vec<&'a str> {
+    cmdline
+        .iter()
+        .filter(|arg| {
+            arg.starts_with(ROOT)
+                || arg.starts_with(ROOTFLAGS)
+                || arg.starts_with(INITRD_ARG_PREFIX)
+        })
+        .copied()
+        .collect()
+}
+
 /// Load kargs.d files from the target ostree commit root
 pub(crate) fn get_kargs_from_ostree_root(
     repo: &ostree::Repo,

crates/lib/src/deploy.rs

@@ -587,7 +587,7 @@ async fn deploy(
     // doesn't use this API).
     let (stateroot, override_kargs) = match &from {
         MergeState::MergeDeployment(deployment) => {
-            let kargs = crate::kargs::get_kargs(sysroot, &deployment, image)?;
+            let kargs = crate::bootc_kargs::get_kargs(sysroot, &deployment, image)?;
             (deployment.stateroot().into(), kargs)
         }
         MergeState::Reset { stateroot, kargs } => (stateroot.clone(), kargs.clone()),
@@ -614,7 +614,7 @@ async fn deploy(
                 .map(|s| s.as_str())
                 .collect::<Vec<_>>();
             opts.override_kernel_argv = Some(&override_kargs);
-            let deployments = sysroot.deployments();
+            let deployments = ostree.deployments();
             let merge_deployment = merge_deployment.map(|m| &deployments[m]);
             let origin = glib::KeyFile::new();
             origin.load_from_data(&origin_data, glib::KeyFileFlags::NONE)?;
@@ -664,7 +664,8 @@ pub(crate) enum MergeState {
 impl MergeState {
     /// Initialize using the default merge deployment for the given stateroot.
     pub(crate) fn from_stateroot(sysroot: &Storage, stateroot: &str) -> Result<Self> {
-        let merge_deployment = sysroot.merge_deployment(Some(stateroot)).ok_or_else(|| {
+        let ostree = sysroot.get_ostree()?;
+        let merge_deployment = ostree.merge_deployment(Some(stateroot)).ok_or_else(|| {
             anyhow::anyhow!("No merge deployment found for stateroot {stateroot}")
         })?;
         Ok(Self::MergeDeployment(merge_deployment))
@@ -696,13 +697,11 @@ pub(crate) async fn stage(
         bootc.image.reference = &spec.image.image,
         bootc.image.transport = &spec.image.transport,
         bootc.manifest_digest = image.manifest_digest.as_ref(),
-        bootc.stateroot = stateroot,
         "Staging image for deployment: {} (digest: {})",
         spec.image,
         image.manifest_digest
     );
 
-    let ostree = sysroot.get_ostree()?;
     let mut subtask = SubTaskStep {
         subtask: "merging".into(),
         description: "Merging Image".into(),

crates/lib/src/install.rs

@@ -60,7 +60,6 @@ use crate::containerenv::ContainerExecutionInfo;
 use crate::deploy::{
     prepare_for_pull, pull_from_prepared, MergeState, PreparedImportMeta, PreparedPullResult,
 };
-use crate::kernel_cmdline::Cmdline;
 use crate::lsm;
 use crate::progress_jsonl::ProgressWriter;
 use crate::spec::{Bootloader, ImageReference};
@@ -2202,17 +2201,17 @@ pub(crate) async fn install_reset(opts: InstallResetOpts) -> Result<()> {
     let prog: ProgressWriter = opts.progress.try_into()?;
 
     let sysroot = &crate::cli::get_storage().await?;
-    let repo = &sysroot.repo();
-    let (booted_deployment, _deployments, host) =
-        crate::status::get_status_require_booted(sysroot)?;
+    let ostree = sysroot.get_ostree()?;
+    let repo = &ostree.repo();
+    let (booted_deployment, _deployments, host) = crate::status::get_status_require_booted(ostree)?;
 
-    let stateroots = list_stateroots(sysroot)?;
+    let stateroots = list_stateroots(ostree)?;
     dbg!(&stateroots);
     let target_stateroot = if let Some(s) = opts.stateroot {
         s
     } else {
         let now = chrono::Utc::now();
-        let r = allocate_new_stateroot(&sysroot, &stateroots, now)?;
+        let r = allocate_new_stateroot(&ostree, &stateroots, now)?;
         r.name
     };
 
@@ -2252,7 +2251,7 @@ pub(crate) async fn install_reset(opts: InstallResetOpts) -> Result<()> {
             .ok_or_else(|| anyhow!("Missing bootcfg for booted deployment"))?;
         if let Some(options) = bootcfg.get("options") {
             let options = options.split_ascii_whitespace().collect::<Vec<_>>();
-            crate::kernel::root_args_from_cmdline(&options)
+            crate::bootc_kargs::root_args_from_cmdline(&options)
                 .into_iter()
                 .map(ToOwned::to_owned)
                 .collect::<Vec<_>>()
@@ -2261,7 +2260,7 @@ pub(crate) async fn install_reset(opts: InstallResetOpts) -> Result<()> {
         }
     };
 
-    let kargs = crate::kargs::get_kargs_in_root(rootfs, std::env::consts::ARCH)?
+    let kargs = crate::bootc_kargs::get_kargs_in_root(rootfs, std::env::consts::ARCH)?
         .into_iter()
         .chain(root_kargs.into_iter())
         .chain(opts.karg.unwrap_or_default())

crates/ostree-ext/src/container/deploy.rs

@@ -1,10 +1,10 @@
 //! Perform initial setup for a container image based system root
 
-use std::collections::HashSet;
-
+#[cfg(feature = "bootc")]
 use anyhow::Result;
 use fn_error_context::context;
 use ostree::glib;
+use std::collections::HashSet;
 
 use super::store::{gc_image_layers, LayeredImageState};
 use super::{ImageReference, OstreeImageReference};
@@ -51,13 +51,6 @@ pub struct DeployOpts<'a> {
     pub no_clean: bool,
 }
 
-// Access the file descriptor for a sysroot
-#[allow(unsafe_code)]
-#[cfg(feature = "bootc")]
-pub(crate) fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd<'_> {
-    unsafe { BorrowedFd::borrow_raw(sysroot.fd()) }
-}
-
 /// Write a container image to an OSTree deployment.
 ///
 /// This API is currently intended for only an initial deployment.

crates/ostree-ext/src/sysroot.rs

@@ -40,7 +40,7 @@ impl Deref for SysrootLock {
 
 /// Access the file descriptor for a sysroot
 #[allow(unsafe_code)]
-pub fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd {
+pub fn sysroot_fd(sysroot: &ostree::Sysroot) -> BorrowedFd<'_> {
     unsafe { BorrowedFd::borrow_raw(sysroot.fd()) }
 }