Skip to content

s390x: do not write first boot args to BLS file #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgwalters merged 1 commit into from
Oct 23, 2019
Merged

s390x: do not write first boot args to BLS file #780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/create_disk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,23 +193,21 @@ else
# see https://github.com/ibm-s390-tools/s390-tools/issues/64
blsfile=$(find rootfs/boot/loader/entries/*.conf)
tmpfile=$(mktemp)
for f in title version linux initrd; do
for f in title version linux initrd options; do
echo $(grep $f $blsfile) >> $tmpfile
done
cat $tmpfile > $blsfile
# we force firstboot in building base image on s390x, ignition-dracut hook will remove
# this and update zipl for second boot
# this is only a temporary solution until we are able to do firstboot check at bootloader
# stage on s390x, either through zipl->grub2-emu or zipl standalone.
# See https://github.com/coreos/ignition-dracut/issues/84
options="$(grep options $blsfile | cut -d' ' -f2-) ignition.firstboot rd.neednet=1 ip=dhcp"
echo "options $options" >> $tmpfile
cat $tmpfile > $blsfile
echo "$(grep options $blsfile) ignition.firstboot rd.neednet=1 ip=dhcp" > $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.
# without chroot we can use --target option in zipl but it requires kernel + initramfs
# pair instead
echo $options > $tmpfile
zipl --verbose \
--target rootfs/boot \
--image rootfs/boot/"$(grep linux $blsfile | cut -d' ' -f2)" \
Expand Down