Merge pull request #235 from martinezjavier/skip-s390x
Don't modify the BLS snippets on s390x
This commit is contained in:
commit
26d41f44e6
1 changed files with 3 additions and 8 deletions
|
|
@ -19,20 +19,15 @@ LOADER_ENTRIES="$BOOT_ROOT/loader/entries"
|
|||
|
||||
[ "$COMMAND" = "add" ] || exit 0
|
||||
|
||||
# Workaround for rhbz#1657858
|
||||
# The zipl bootloader doesn't support variables
|
||||
ARCH=`uname -m`
|
||||
[ "${ARCH:0:4}" = "s390" ]
|
||||
HANDLE_INITRD="$?"
|
||||
[ "${ARCH:0:4}" = "s390" ] && exit 0
|
||||
|
||||
pushd "$LOADER_ENTRIES" &> /dev/null
|
||||
for f in `basename "$MACHINE_ID"`-*.conf; do
|
||||
if [ -f "$f" -a "${f: -12}" != "-rescue.conf" ]; then
|
||||
grep -q '^\s*options\s\+.*\$tuned_params' "$f" || sed -i '/^\s*options\s\+/ s/\(.*\)/\1 \$tuned_params/' "$f"
|
||||
if [ "$HANDLE_INITRD" = "1" ]; then
|
||||
grep -q '^\s*initrd\s\+.*\$tuned_initrd' "$f" || sed -i '/^\s*initrd\s\+/ s/\(.*\)/\1 \$tuned_initrd/' "$f"
|
||||
else
|
||||
sed -i '/^\s*initrd\s\+.*\$tuned_initrd/ s/\s\+\$tuned_initrd\b//g' "$f"
|
||||
fi
|
||||
grep -q '^\s*initrd\s\+.*\$tuned_initrd' "$f" || sed -i '/^\s*initrd\s\+/ s/\(.*\)/\1 \$tuned_initrd/' "$f"
|
||||
fi
|
||||
done
|
||||
popd &> /dev/null
|
||||
|
|
|
|||
Loading…
Reference in a new issue