From 167b9e49fc7a968794b018e06f6cf07a8efd995c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 2 Nov 2023 17:54:10 -0400 Subject: [PATCH] install: Actually honor kargs I think this got lost in a refactoring. Closes: https://github.com/containers/bootc/issues/163 Signed-off-by: Colin Walters --- lib/src/install.rs | 1 + tests/kolainst/install | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/src/install.rs b/lib/src/install.rs index 576e357a9..60ebf0259 100644 --- 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::>(); let mut options = ostree_container::deploy::DeployOpts::default(); options.kargs = Some(kargs.as_slice()); diff --git a/tests/kolainst/install b/tests/kolainst/install index be37fb423..03ad9d6a2 100755 --- 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