From 750c7451b60f4960ea7b2922d34fede0003fb9ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Mar 2024 13:03:20 +0100 Subject: [PATCH] docs: clarify that `--karg` can be passed multiple times It is not clear from the current man-page that `--karg` can be passed multiple times. From reading the code it seems to be the case but because it's not obvious (to me) I also added a small testcase to the CI to ensure that I'm not misreading things. I added a small comment to the docs that it can be given multiple times. --- .github/workflows/ci.yml | 3 ++- docs/src/man/bootc-install-to-disk.md | 2 +- docs/src/man/bootc-install-to-filesystem.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 933060c8..6be958cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,9 +135,10 @@ jobs: echo 'ssh-ed25519 ABC0123 testcase@example.com' > test_authorized_keys sudo podman run --rm -ti --privileged -v ./test_authorized_keys:/test_authorized_keys --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \ quay.io/centos-bootc/centos-bootc-dev:stream9 bootc install to-filesystem \ - --karg=foo=bar --disable-selinux --replace=alongside --root-ssh-authorized-keys=/test_authorized_keys /target + --karg=foo=bar --karg=baz=foobar --disable-selinux --replace=alongside --root-ssh-authorized-keys=/test_authorized_keys /target ls -al /boot/loader/ sudo grep foo=bar /boot/loader/entries/*.conf + sudo grep baz=foobar /boot/loader/entries/*.conf grep authorized_keys /ostree/deploy/default/deploy/*/etc/tmpfiles.d/bootc-root-ssh.conf # TODO fix https://github.com/containers/bootc/pull/137 sudo chattr -i /ostree/deploy/default/deploy/* diff --git a/docs/src/man/bootc-install-to-disk.md b/docs/src/man/bootc-install-to-disk.md index dc476ec9..ae43c7f6 100644 --- a/docs/src/man/bootc-install-to-disk.md +++ b/docs/src/man/bootc-install-to-disk.md @@ -96,7 +96,7 @@ disabled but where the target does have SELinux enabled. **\--karg**=*KARG* -: Add a kernel argument +: Add a kernel argument (can be given multiple times) **\--root-ssh-authorized-keys**=*ROOT_SSH_AUTHORIZED_KEYS* diff --git a/docs/src/man/bootc-install-to-filesystem.md b/docs/src/man/bootc-install-to-filesystem.md index b757b7cd..3c66ca75 100644 --- a/docs/src/man/bootc-install-to-filesystem.md +++ b/docs/src/man/bootc-install-to-filesystem.md @@ -98,7 +98,7 @@ disabled but where the target does have SELinux enabled. **\--karg**=*KARG* -: Add a kernel argument +: Add a kernel argument (can be given multiple times) **\--root-ssh-authorized-keys**=*ROOT_SSH_AUTHORIZED_KEYS*