File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -611,7 +611,8 @@ fn install_create_rootfs(state: &State) -> Result<RootSetup> {
611
611
let root_uuid = mkfs ( rootdev, opts. filesystem , Some ( "root" ) , [ ] ) ?;
612
612
let rootarg = format ! ( "root=UUID={root_uuid}" ) ;
613
613
let bootarg = format ! ( "boot=UUID={boot_uuid}" ) ;
614
- let kargs = vec ! [ rootarg, RW_KARG . to_string( ) , bootarg] ;
614
+ let mut kargs = opts. config_opts . karg . clone ( ) . unwrap_or_default ( ) ;
615
+ kargs. extend ( [ rootarg, RW_KARG . to_string ( ) , bootarg] ) ;
615
616
616
617
mount ( rootdev, & rootfs) ?;
617
618
lsm_label ( & rootfs, "/" . into ( ) , false ) ?;
Original file line number Diff line number Diff line change @@ -12,15 +12,19 @@ set -xeuo pipefail
12
12
13
13
# See https://github.com/cgwalters/bootc-base-images
14
14
IMAGE=quay.io/cgwalters/fedora-oscore:latest
15
+ # TODO: better detect this, e.g. look for an empty device
16
+ DEV=/dev/vda
15
17
16
18
# Always work out of a temporary directory
17
19
cd $( mktemp -d)
18
20
19
21
case " ${AUTOPKGTEST_REBOOT_MARK:- } " in
20
22
" " )
21
- podman run --rm -ti --privileged --pid=host --net=none -v /usr/bin/bootc:/usr/bin/bootc ${IMAGE} bootc install /dev/vda
23
+ podman run --rm -ti --privileged --pid=host --net=none -v /usr/bin/bootc:/usr/bin/bootc ${IMAGE} bootc install --karg=foo=bar ${DEV}
22
24
# In theory we could e.g. wipe the bootloader setup on the primary disk, then reboot;
23
25
# but for now let's just sanity test that the install command executes.
26
+ partprobe ${DEV}
27
+ lsblk ${DEV}
24
28
echo " ok install"
25
29
;;
26
30
* ) echo " unexpected mark: ${AUTOPKGTEST_REBOOT_MARK} " ; exit 1;;
You can’t perform that action at this time.
0 commit comments