install: Actually honor kargs

I think this got lost in a refactoring. Closes: #163 Signed-off-by: Colin Walters <[email protected]>
containers · Nov 3, 2023 · 167b9e4 · 167b9e4
1 parent 6849620
commit 167b9e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/src/install.rs b/lib/src/install.rs
@@ -531,6 +531,7 @@ async fn initialize_ostree_root_from_self(
         .kargs
         .iter()
         .map(|v| v.as_str())
+        .chain(state.config_opts.karg.iter().flatten().map(|v| v.as_str()))
         .collect::<Vec<_>>();
     let mut options = ostree_container::deploy::DeployOpts::default();
     options.kargs = Some(kargs.as_slice());

diff --git a/tests/kolainst/install b/tests/kolainst/install
@@ -23,6 +23,9 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     # In theory we could e.g. wipe the bootloader setup on the primary disk, then reboot;
     # but for now let's just sanity test that the install command executes.
     lsblk ${DEV}
+    mount /dev/vda3 /var/mnt
+    grep foo=bar /var/mnt/loader/entries/*.conf
+    umount /var/mnt
     echo "ok install"
 
     # Now test install-to-filesystem