-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #606 from cgwalters/debug-kargs
install: Fix install config kargs + to-filesystem
- Loading branch information
Showing
5 changed files
with
22 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,11 +88,18 @@ pub(crate) fn run_alongside(image: &str, mut testargs: libtest_mimic::Arguments) | |
std::fs::write(&tmp_keys, b"ssh-ed25519 ABC0123 [email protected]")?; | ||
cmd!(sh, "sudo {BASE_ARGS...} {target_args...} -v {tmp_keys}:/test_authorized_keys {image} bootc install to-filesystem {generic_inst_args...} --acknowledge-destructive --karg=foo=bar --replace=alongside --root-ssh-authorized-keys=/test_authorized_keys /target").run()?; | ||
|
||
// Test kargs injected via CLI | ||
cmd!( | ||
sh, | ||
"sudo /bin/sh -c 'grep foo=bar /boot/loader/entries/*.conf'" | ||
) | ||
.run()?; | ||
// And kargs we added into our default container image | ||
cmd!( | ||
sh, | ||
"sudo /bin/sh -c 'grep localtestkarg=somevalue /boot/loader/entries/*.conf'" | ||
) | ||
.run()?; | ||
let deployment = &find_deployment_root()?; | ||
let cwd = sh.push_dir(format!("/proc/self/fd/{}", deployment.as_raw_fd())); | ||
cmd!( | ||
|