diff --git a/src/create_disk.sh b/src/create_disk.sh index 192c17d11d..d94a6efdf2 100755 --- a/src/create_disk.sh +++ b/src/create_disk.sh @@ -385,7 +385,7 @@ s390x) # stage on s390x, either through zipl->grub2-emu or zipl standalone. # See https://github.com/coreos/ignition-dracut/issues/84 # A similar hack is present in https://github.com/coreos/coreos-assembler/blob/master/src/gf-platformid#L55 - echo "$(grep options $blsfile) ignition.firstboot rd.neednet=1 ip=dhcp,dhcp6" > $tmpfile + echo "$(grep options $blsfile) ignition.firstboot" > $tmpfile # ideally we want to invoke zipl with bls and zipl.conf but we might need # to chroot to $rootfs/ to do so. We would also do that when FCOS boot on its own. diff --git a/src/gf-platformid b/src/gf-platformid index 7df7dc53d1..889be98deb 100755 --- a/src/gf-platformid +++ b/src/gf-platformid @@ -52,7 +52,7 @@ coreos_gf upload "${tmpd}"/bls.conf "${blscfg_path}" if [ "$basearch" = "s390x" ] ; then # Before we re-run zipl make sure we have the firstboot options # A hack similar to https://github.com/coreos/coreos-assembler/blob/master/src/create_disk.sh#L381 - sed -i -e 's,^\(options .*\),\1 ignition.firstboot rd.neednet=1 ip=dhcp\,dhcp6,' "${tmpd}"/bls.conf + sed -i -e 's,^\(options .*\),\1 ignition.firstboot,' "${tmpd}"/bls.conf coreos_gf rename "${blscfg_path}" "${blscfg_path}.orig" coreos_gf upload "${tmpd}"/bls.conf "${blscfg_path}" diff --git a/src/grub.cfg b/src/grub.cfg index 61b594bfcc..8d84d4cbd8 100644 --- a/src/grub.cfg +++ b/src/grub.cfg @@ -44,8 +44,7 @@ fi # which is used in the kernel command line. set ignition_firstboot="" if [ -f "/ignition.firstboot" ]; then - # default to dhcp networking parameters to be used with ignition - set ignition_network_kcmdline='rd.neednet=1 ip=dhcp,dhcp6' + set ignition_network_kcmdline='' # source in the `ignition.firstboot` file which could override the # above $ignition_network_kcmdline with static networking config.