Don't modify the BLS snippets on s390x #235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yarda
requested changes
Apr 29, 2020
92-tuned.install
Outdated
| else | ||
| sed -i '/^\s*initrd\s\+.*\$tuned_initrd/ s/\s\+\$tuned_initrd\b//g' "$f" | ||
| fi | ||
| sed -i '/^\s*initrd\s\+.*\$tuned_initrd/ s/\s\+\$tuned_initrd\b//g' "$f" |
There was a problem hiding this comment.
I guess this line should be:
grep -q '^\s*initrd\s\+.*\$tuned_initrd' "$f" || sed -i '/^\s*initrd\s\+/ s/\(.*\)/\1 \$tuned_initrd/' "$f"
Otherwise it would break initrd handling on non zipl machines.
There was a problem hiding this comment.
I guess this line should be:
I think you are right. I've updated the commit now. I wasn't able to get a s390x machine so couldn't test this version.
Currently the 92-tuned.install kernel-install plugin adds the tuned params to the BLS config files in s390x machines. But the zipl bootloader doesn't have support for variables, which leads to cmdlines like the following: root=/dev/mapper/rhel-root crashkernel=auto rd.dasd=0.0.541f rd.dasd=0.0.551f rd.dasd=0.0.561f rd.dasd=0.0.571f rd.lvm.lv=rhel/root rd.lvm.lv=rhel/swap cio_ignore=all,!condev rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portno=0 $tuned_params BOOT_IMAGE=0 Don't modify the BLS snippet since the zipl bootloader doesn't support the variables and just make the script to exit if the architecture is s390x. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
martinezjavier
force-pushed
the
skip-s390x
branch
from
d3689fa
to
33d5386
Compare
|
Thanks, merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently the 92-tuned.install kernel-install plugin adds the tuned params
to the BLS config files in s390x machines. But the zipl bootloader doesn't
support for environment variables, which leads to cmdlines like following:
root=/dev/mapper/rhel-root crashkernel=auto rd.dasd=0.0.541f rd.dasd=0.0.551f
rd.dasd=0.0.561f rd.dasd=0.0.571f rd.lvm.lv=rhel/root rd.lvm.lv=rhel/swap
cio_ignore=all,!condev rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portno=0
$tuned_params BOOT_IMAGE=0
Don't modify the BLS snippets ince the zipl bootloader doesn't support the
variables and just exit the script in the s390x case.
Signed-off-by: Javier Martinez Canillas javierm@redhat.com