Skip to content

Commit daeb900

Browse files
authored
Merge pull request #172 from cgwalters/install-alongside-karg
install: Actually honor kargs
2 parents 08a5ff6 + 167b9e4 commit daeb900

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

lib/src/install.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ async fn initialize_ostree_root_from_self(
531531
.kargs
532532
.iter()
533533
.map(|v| v.as_str())
534+
.chain(state.config_opts.karg.iter().flatten().map(|v| v.as_str()))
534535
.collect::<Vec<_>>();
535536
let mut options = ostree_container::deploy::DeployOpts::default();
536537
options.kargs = Some(kargs.as_slice());

tests/kolainst/install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
2323
# In theory we could e.g. wipe the bootloader setup on the primary disk, then reboot;
2424
# but for now let's just sanity test that the install command executes.
2525
lsblk ${DEV}
26+
mount /dev/vda3 /var/mnt
27+
grep foo=bar /var/mnt/loader/entries/*.conf
28+
umount /var/mnt
2629
echo "ok install"
2730

2831
# Now test install-to-filesystem

0 commit comments

Comments
 (0)