Skip to content

Commit 3d742f1

Browse files
committed
Revert "create_disk.sh: go back to using --kargs for rdcore zipl"
Now that rdcore zipl supports --append-karg, use it. This reverts commit b27aa81.
1 parent 486b4f0 commit 3d742f1

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/create_disk.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,9 +488,7 @@ ppc64le)
488488
;;
489489
s390x)
490490
ostree config --repo $rootfs/ostree/repo set sysroot.bootloader zipl
491-
# XXX: switch to using --append-karg once we have new enough rdcore
492-
# https://github.com/coreos/coreos-installer/pull/950
493-
rdcore_zipl_args=("--boot-mount=$rootfs/boot" "--kargs=ignition.firstboot")
491+
rdcore_zipl_args=("--boot-mount=$rootfs/boot" "--append-karg=ignition.firstboot")
494492
# in the secex case, we run zipl at the end; in the non-secex case, we need
495493
# to run it now because zipl wants rw access to the bootfs
496494
if [[ ${secure_execution} -ne 1 ]]; then

0 commit comments

Comments
 (0)