import s390utils-2.6.0-28.el8_2.2
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
7533564948
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
SOURCES/cmsfs-1.1.8c.tar.gz
|
||||||
|
SOURCES/s390-tools-2.6.0.tar.gz
|
||||||
|
SOURCES/src_vipa-2.1.0.tar.gz
|
||||||
3
.s390utils.metadata
Normal file
3
.s390utils.metadata
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
|
||||||
|
46a09493030c3c80987b7710e34a33462e4b90f4 SOURCES/s390-tools-2.6.0.tar.gz
|
||||||
|
8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz
|
||||||
9
SOURCES/00-zipl-prepare.install
Executable file
9
SOURCES/00-zipl-prepare.install
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
COMMAND="$1"
|
||||||
|
KERNEL_VERSION="$2"
|
||||||
|
BOOT_DIR_ABS="$3"
|
||||||
|
KERNEL_IMAGE="$4"
|
||||||
|
|
||||||
|
# Remove it, since for zipl the images are always installed in /boot
|
||||||
|
rm -rf "${BOOT_DIR_ABS%/*}"
|
||||||
179
SOURCES/20-zipl-kernel.install
Executable file
179
SOURCES/20-zipl-kernel.install
Executable file
@ -0,0 +1,179 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -f /etc/sysconfig/kernel ]] && . /etc/sysconfig/kernel
|
||||||
|
|
||||||
|
COMMAND="$1"
|
||||||
|
KERNEL_VERSION="$2"
|
||||||
|
BOOT_DIR_ABS="$3"
|
||||||
|
KERNEL_IMAGE="$4"
|
||||||
|
|
||||||
|
KERNEL_DIR="${KERNEL_IMAGE%/*}"
|
||||||
|
|
||||||
|
MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
|
||||||
|
|
||||||
|
BLS_DIR="/boot/loader/entries"
|
||||||
|
ZIPLCFG="/etc/zipl.conf"
|
||||||
|
CMDLINE_LINUX_DEBUG=" systemd.log_level=debug systemd.log_target=kmsg"
|
||||||
|
LINUX_DEBUG_VERSION_POSTFIX="_with_debugging"
|
||||||
|
LINUX_DEBUG_TITLE_POSTFIX=" with debugging"
|
||||||
|
|
||||||
|
mkbls() {
|
||||||
|
local kernelver=$1 && shift
|
||||||
|
local datetime=$1 && shift
|
||||||
|
local kernelopts=$1 && shift
|
||||||
|
|
||||||
|
local debugname=""
|
||||||
|
local flavor=""
|
||||||
|
|
||||||
|
if [[ "$kernelver" == *\+* ]] ; then
|
||||||
|
local flavor=-"${kernelver##*+}"
|
||||||
|
if [[ "${flavor}" == "-debug" ]]; then
|
||||||
|
local debugname=" with debugging"
|
||||||
|
local debugid="-debug"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOF
|
||||||
|
title ${NAME} (${kernelver}) ${VERSION}${debugname}
|
||||||
|
version ${kernelver}${debugid}
|
||||||
|
linux /boot/vmlinuz-${kernelver}
|
||||||
|
initrd /boot/initramfs-${kernelver}.img
|
||||||
|
options ${kernelopts}
|
||||||
|
id ${ID}-${datetime}-${kernelver}${debugid}
|
||||||
|
grub_users \$grub_users
|
||||||
|
grub_arg --unrestricted
|
||||||
|
grub_class kernel${flavor}
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
[[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
|
||||||
|
case "$COMMAND" in
|
||||||
|
add)
|
||||||
|
if [[ "${KERNEL_DIR}" != "/boot" ]]; then
|
||||||
|
for i in \
|
||||||
|
"$KERNEL_IMAGE" \
|
||||||
|
"$KERNEL_DIR"/System.map \
|
||||||
|
"$KERNEL_DIR"/config \
|
||||||
|
"$KERNEL_DIR"/zImage.stub
|
||||||
|
do
|
||||||
|
[[ -e "$i" ]] || continue
|
||||||
|
cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||||
|
command -v restorecon &>/dev/null && \
|
||||||
|
restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||||
|
done
|
||||||
|
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
||||||
|
i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
|
||||||
|
if [[ -e "$i" ]]; then
|
||||||
|
cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||||
|
command -v restorecon &>/dev/null && \
|
||||||
|
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
|
||||||
|
declare -a BOOT_OPTIONS
|
||||||
|
if [[ -f /etc/kernel/cmdline ]]; then
|
||||||
|
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||||
|
read -r -d '' -a line < /proc/cmdline
|
||||||
|
for i in "${line[@]}"; do
|
||||||
|
[[ "${i#initrd=*}" != "$i" || "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
|
||||||
|
BOOT_OPTIONS+=("$i")
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||||
|
echo "Could not determine the kernel command line parameters." >&2
|
||||||
|
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
||||||
|
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
|
||||||
|
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
|
||||||
|
cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
|
||||||
|
sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
|
||||||
|
sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
|
||||||
|
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
|
||||||
|
else
|
||||||
|
mkbls "${KERNEL_VERSION}" \
|
||||||
|
"$(date -u +%Y%m%d%H%M%S -d "$(stat -c '%y' "${KERNEL_DIR}")")" \
|
||||||
|
"${BOOT_OPTIONS[*]}" >"${BLS_TARGET}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$DEFAULTDEBUG" != "xyes" ]; then
|
||||||
|
UPDATEDEFAULT="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "x$UPDATEDEFAULT" = "xyes" ]]; then
|
||||||
|
TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
NEWDEFAULT="${TITLE}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "x${MAKEDEBUG}" = "xyes" ]; then
|
||||||
|
BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||||
|
cp -aT "${BLS_TARGET}" "${BLS_DEBUG}"
|
||||||
|
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
|
||||||
|
BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||||
|
sed -i -e "s/^title.*/title ${TITLE}${LINUX_DEBUG_TITLE_POSTFIX}/" "${BLS_DEBUG}"
|
||||||
|
sed -i -e "s/^version.*/version ${VERSION}${LINUX_DEBUG_VERSION_POSTFIX}/" "${BLS_DEBUG}"
|
||||||
|
sed -i -e "s/^id.*/${BLSID}/" "${BLS_DEBUG}"
|
||||||
|
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}${CMDLINE_LINUX_DEBUG}#" "${BLS_DEBUG}"
|
||||||
|
if [ -n "$NEWDEFAULT" -a "x$DEFAULTDEBUG" = "xyes" ]; then
|
||||||
|
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
NEWDEFAULT="${TITLE}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$NEWDEFAULT" ]; then
|
||||||
|
sed -i -e "s,^default=.*,default=${NEWDEFAULT}," "${ZIPLCFG}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
/sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
|
||||||
|
/sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
|
||||||
|
/sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
|
||||||
|
# If grubby is used there's no need to run other installation plugins
|
||||||
|
exit 77
|
||||||
|
;;
|
||||||
|
remove)
|
||||||
|
if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
|
||||||
|
ARCH="$(uname -m)"
|
||||||
|
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
|
||||||
|
BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||||
|
|
||||||
|
TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
|
||||||
|
|
||||||
|
if [[ -f "${BLS_DEBUG}" ]]; then
|
||||||
|
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
||||||
|
sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f "${BLS_TARGET}" "${BLS_DEBUG}"
|
||||||
|
|
||||||
|
for i in vmlinuz System.map config zImage.stub dtb; do
|
||||||
|
rm -rf "/boot/${i}-${KERNEL_VERSION}"
|
||||||
|
done
|
||||||
|
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
||||||
|
rm -f "/boot/.vmlinuz-${KERNEL_VERSION}.hmac"
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
/sbin/new-kernel-pkg --package "kernel${flavor+-$flavor}" --rminitrd --rmmoddep --remove "$KERNEL_VERSION" || exit $?
|
||||||
|
# If grubby is used there's no need to run other installation plugins
|
||||||
|
exit 77
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
48
SOURCES/52-zipl-rescue.install
Executable file
48
SOURCES/52-zipl-rescue.install
Executable file
@ -0,0 +1,48 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
[[ -f /etc/os-release ]] && . /etc/os-release
|
||||||
|
[[ -f /etc/sysconfig/kernel ]] && . /etc/sysconfig/kernel
|
||||||
|
|
||||||
|
COMMAND="$1"
|
||||||
|
KERNEL_VERSION="$2"
|
||||||
|
BOOT_DIR_ABS="$3"
|
||||||
|
KERNEL_IMAGE="$4"
|
||||||
|
|
||||||
|
MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
|
||||||
|
|
||||||
|
BLS_DIR="/boot/loader/entries"
|
||||||
|
|
||||||
|
[[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
|
||||||
|
case "$COMMAND" in
|
||||||
|
add)
|
||||||
|
if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
|
||||||
|
declare -a BOOT_OPTIONS
|
||||||
|
if [[ -f /etc/kernel/cmdline ]]; then
|
||||||
|
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||||
|
read -r -d '' -a line < /proc/cmdline
|
||||||
|
for i in "${line[@]}"; do
|
||||||
|
[[ "${i#initrd=*}" != "$i" ]] && continue
|
||||||
|
BOOT_OPTIONS+=("$i")
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||||
|
echo "Could not determine the kernel command line parameters." >&2
|
||||||
|
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
|
||||||
|
if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
|
||||||
|
sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
|
||||||
|
sed -i -e "s,^initrd.*,initrd /boot/initramfs-0-rescue-${MACHINE_ID}.img,g" "${BLS_RESCUE}"
|
||||||
|
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_RESCUE}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
15
SOURCES/91-zipl.install
Executable file
15
SOURCES/91-zipl.install
Executable file
@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ ! -f /etc/zipl.conf ]]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
COMMAND="$1"
|
||||||
|
|
||||||
|
case "$COMMAND" in
|
||||||
|
add|remove)
|
||||||
|
zipl > /dev/null
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
13
SOURCES/ccw.udev
Normal file
13
SOURCES/ccw.udev
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
ACTION!="add|change", GOTO="ccw_end"
|
||||||
|
SUBSYSTEM!="ccw", GOTO="ccw_end"
|
||||||
|
ATTRS{cutype}=="1731/01", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="1731/02", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="1731/05", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="1731/06", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/01", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/08", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/60", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/61", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/1e", RUN+="ccw_init"
|
||||||
|
ATTRS{cutype}=="3088/1f", RUN+="ccw_init"
|
||||||
|
LABEL="ccw_end"
|
||||||
185
SOURCES/ccw_init
Normal file
185
SOURCES/ccw_init
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
[ -z "$DEVPATH" ] && exit 0
|
||||||
|
[ "$SUBSYSTEM" != "ccw" ] && exit 0
|
||||||
|
|
||||||
|
[ -e /etc/ccw.conf ] && MODE="dracut" || MODE="normal"
|
||||||
|
OLD_IFS="$IFS"
|
||||||
|
|
||||||
|
get_config_line_by_subchannel()
|
||||||
|
{
|
||||||
|
local CHANNEL
|
||||||
|
CHANNEL="$1"
|
||||||
|
while read line; do
|
||||||
|
IFS=","
|
||||||
|
set $line
|
||||||
|
IFS="$OLD_IFS"
|
||||||
|
for i in $@; do
|
||||||
|
if [ "$CHANNEL" = "$i" ]; then
|
||||||
|
echo $line
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done < /etc/ccw.conf
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# borrowed from network-scrips, initscripts along with the get_config_by_subchannel
|
||||||
|
[ -z "$__sed_discard_ignored_files" ] && __sed_discard_ignored_files='/\(~\|\.bak\|\.old\|\.orig\|\.rpmnew\|\.rpmorig\|\.rpmsave\)$/d'
|
||||||
|
|
||||||
|
get_config_by_subchannel ()
|
||||||
|
{
|
||||||
|
LANG=C grep -E -i -l \
|
||||||
|
"^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){0,2}${1}(,[0-9]\.[0-9]\.[a-f0-9]+){0,2}['\"]?([[:space:]]+#|[[:space:]]*$)" \
|
||||||
|
/etc/sysconfig/network-scripts/ifcfg-* \
|
||||||
|
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
|
||||||
|
}
|
||||||
|
|
||||||
|
CHANNEL=${DEVPATH##*/}
|
||||||
|
|
||||||
|
if [ $MODE = "dracut" ]; then
|
||||||
|
CONFIG_LINE=$(get_config_line_by_subchannel $CHANNEL)
|
||||||
|
|
||||||
|
[ $? -ne 0 -o -z "$CONFIG_LINE" ] && break
|
||||||
|
|
||||||
|
IFS=","
|
||||||
|
set $CONFIG_LINE
|
||||||
|
IFS="$OLD_IFS"
|
||||||
|
NETTYPE=$1
|
||||||
|
shift
|
||||||
|
SUBCHANNELS="$1"
|
||||||
|
OPTIONS=""
|
||||||
|
shift
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
*=*) OPTIONS="$OPTIONS $1";;
|
||||||
|
[0-9]*) SUBCHANNELS="$SUBCHANNELS,$1";;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
elif [ $MODE = "normal" ]; then
|
||||||
|
NOLOCALE="yes"
|
||||||
|
|
||||||
|
CONFIG_FILE=$(get_config_by_subchannel $CHANNEL)
|
||||||
|
|
||||||
|
if [ -n "$CONFIG_FILE" ]; then
|
||||||
|
. $CONFIG_FILE
|
||||||
|
else
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Unknown mode=$MODE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# now we have extracted these variables from the config files:
|
||||||
|
# SUBCHANNELS
|
||||||
|
# OPTIONS
|
||||||
|
|
||||||
|
# put LAYER2 option into its own variable
|
||||||
|
set $OPTIONS
|
||||||
|
OPTIONS=""
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
layer2=*) LAYER2=${1##layer2=};;
|
||||||
|
*=*) OPTIONS="$OPTIONS $1";;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# translate variables from the interface config files to OPTIONS
|
||||||
|
if [ -n "$PORTNAME" ]; then
|
||||||
|
if [ "$NETTYPE" = "lcs" ]; then
|
||||||
|
OPTIONS="$OPTIONS portno=$PORTNAME"
|
||||||
|
else
|
||||||
|
OPTIONS="$OPTIONS portname=$PORTNAME"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if [ "$NETTYPE" = "ctc" -a -n "$CTCPROT" ]; then
|
||||||
|
OPTIONS="$OPTIONS protocol=$CTCPROT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# SUBCHANNELS is only set on mainframe ccwgroup devices
|
||||||
|
[ -z "$SUBCHANNELS" -o -z "$NETTYPE" ] && exit 0
|
||||||
|
if [ "$NETTYPE" = "ctc" ]; then
|
||||||
|
DIR="/sys/bus/ccwgroup/drivers/ctcm"
|
||||||
|
else
|
||||||
|
DIR="/sys/bus/ccwgroup/drivers/$NETTYPE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
i=0
|
||||||
|
while [ $i -lt 20 ]; do
|
||||||
|
[ -e $DIR ] && break
|
||||||
|
sleep 0.1
|
||||||
|
i=$(($i+1))
|
||||||
|
done
|
||||||
|
|
||||||
|
# driver missing or not loaded
|
||||||
|
[ ! -e $DIR ] && exit 0
|
||||||
|
|
||||||
|
IFS=","
|
||||||
|
set $SUBCHANNELS
|
||||||
|
IFS="$OLD_IFS"
|
||||||
|
CHANNEL1=$1
|
||||||
|
CHANNEL2=$2
|
||||||
|
SYSDIR="$DIR/$CHANNEL1"
|
||||||
|
|
||||||
|
[ -e $SYSDIR ] && exit 0
|
||||||
|
|
||||||
|
# check if the interface is already online
|
||||||
|
if [ -e $SYSDIR/online ]; then
|
||||||
|
read on <$SYSDIR/online
|
||||||
|
[ "$on" = "1" ] && exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
DRIVER=$(readlink $DEVPATH/driver)
|
||||||
|
DRIVER=${DRIVER##*/}
|
||||||
|
if [ "$DRIVER" = "lcs" -a "$NETTYPE" = "ctc" ]; then
|
||||||
|
echo "$CHANNEL" > /sys/bus/ccw/drivers/lcs/unbind
|
||||||
|
echo "$CHANNEL" > /sys/bus/ccw/drivers/ctcm/bind
|
||||||
|
echo "$CHANNEL2" > /sys/bus/ccw/drivers/lcs/unbind
|
||||||
|
echo "$CHANNEL2" > /sys/bus/ccw/drivers/ctcm/bind
|
||||||
|
fi
|
||||||
|
if [ "$DRIVER" = "ctcm" -a "$NETTYPE" = "lcs" ]; then
|
||||||
|
echo "$CHANNEL" > /sys/bus/ccw/drivers/ctcm/unbind
|
||||||
|
echo "$CHANNEL" > /sys/bus/ccw/drivers/lcs/bind
|
||||||
|
echo "$CHANNEL2" > /sys/bus/ccw/drivers/ctcm/unbind
|
||||||
|
echo "$CHANNEL2" > /sys/bus/ccw/drivers/lcs/bind
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -e $SYSDIR ]; then
|
||||||
|
echo "$SUBCHANNELS" > $DIR/group
|
||||||
|
i=0
|
||||||
|
while [ $i -lt 20 ]; do
|
||||||
|
[ -e $SYSDIR ] && break
|
||||||
|
sleep 0.1
|
||||||
|
i=$(($i+1))
|
||||||
|
done
|
||||||
|
|
||||||
|
[ ! -e $SYSDIR ] && exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# check if the interface is already online
|
||||||
|
if [ -e $SYSDIR/online ]; then
|
||||||
|
read on <$SYSDIR/online
|
||||||
|
[ "$on" = "1" ] && exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# first set layer2, other options may depend on it
|
||||||
|
[ -n "$LAYER2" ] && echo $LAYER2 > $SYSDIR/layer2
|
||||||
|
|
||||||
|
if [ -n "$OPTIONS" ]; then
|
||||||
|
for i in $OPTIONS; do
|
||||||
|
OPT=${i%%=*}
|
||||||
|
VAL=${i##*=}
|
||||||
|
if [ -e "$SYSDIR/$OPT" ]; then
|
||||||
|
echo "$VAL" > "$SYSDIR/$OPT" || \
|
||||||
|
echo "Could not set value \"$VAL\" for OPTION \"$OPT\" with SUBCHANNELS \"$SUBCHANNELS\""
|
||||||
|
else
|
||||||
|
echo "OPTION \"$OPT\" does not exist for SUBCHANNELS \"$SUBCHANNELS\""
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
[ -e $SYSDIR/online ] && echo 1 > $SYSDIR/online
|
||||||
12
SOURCES/cmsfs-1.1.8-kernel26.patch
Normal file
12
SOURCES/cmsfs-1.1.8-kernel26.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -urN cmsfs-1.1.8/cmsfssed.sh cmsfs-1.1.8_/cmsfssed.sh
|
||||||
|
--- cmsfs-1.1.8/cmsfssed.sh 2003-02-28 17:52:59.000000000 -0500
|
||||||
|
+++ cmsfs-1.1.8_/cmsfssed.sh 2004-05-28 16:36:22.000000000 -0400
|
||||||
|
@@ -85,7 +85,7 @@
|
||||||
|
DRIVER_SOURCE="cmsfs22x.c"
|
||||||
|
MODULES_DIRECTORY="/lib/modules/`uname -r`/fs"
|
||||||
|
;;
|
||||||
|
- 2.4*|2.5*)
|
||||||
|
+ 2.4*|2.5*|2.6*|3.*|4.*)
|
||||||
|
LINUX_RELEASE="2.4"
|
||||||
|
# ln -s cmsfs24x.c cmsfsvfs.c
|
||||||
|
INCLUDES="-I/lib/modules/`uname -r`/build/include"
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
From 25442f958a12b428b7d063b927ac48965dcd8164 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
|
Date: Fri, 28 Jan 2011 16:11:19 +0100
|
||||||
|
Subject: [PATCH] use detected filesystem block size on FBA devices
|
||||||
|
|
||||||
|
If a FBA device is not properly formated, then the CMS file system can
|
||||||
|
have a different block size. The cmsfs tools were able to detect the file
|
||||||
|
system block size, but in fact they still used default 512 instead. And
|
||||||
|
using the default was causing crashes. Now the detected value is used.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=651012
|
||||||
|
---
|
||||||
|
cmsfsany.c | 2 +-
|
||||||
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cmsfsany.c b/cmsfsany.c
|
||||||
|
index 55bcfdc..18efffb 100644
|
||||||
|
--- a/cmsfsany.c
|
||||||
|
+++ b/cmsfsany.c
|
||||||
|
@@ -102,7 +102,7 @@ int cmsfs_find_label(struct CMSSUPER *vol,struct CMSFSADT *adt)
|
||||||
|
cmsfs_error(cmsfs_ermsg);
|
||||||
|
}
|
||||||
|
vol->flags = CMSFSFBA;
|
||||||
|
- vol->blksz = 512;
|
||||||
|
+ vol->blksz = blksz;
|
||||||
|
return vol->blksz;
|
||||||
|
} }
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.3.5
|
||||||
|
|
||||||
11
SOURCES/cmsfs-1.1.8-warnings.patch
Normal file
11
SOURCES/cmsfs-1.1.8-warnings.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- cmsfs-1.1.8/cmsfsvol.c.warnings 2003-07-18 01:38:57.000000000 +0200
|
||||||
|
+++ cmsfs-1.1.8/cmsfsvol.c 2005-09-06 16:57:15.000000000 +0200
|
||||||
|
@@ -52,7 +52,7 @@
|
||||||
|
|
||||||
|
/* print a header; looks like CMS */
|
||||||
|
(void) printf("LABEL VDEV M STAT CYL TYPE \
|
||||||
|
-BLKSZ FILES BLKS USED-(%) BLKS LEFT BLK TOTAL\n");
|
||||||
|
+BLKSZ FILES BLKS USED-(%%) BLKS LEFT BLK TOTAL\n");
|
||||||
|
|
||||||
|
for ( ; i < argc ; i++)
|
||||||
|
{
|
||||||
16
SOURCES/dasd.udev
Normal file
16
SOURCES/dasd.udev
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="dasd-eckd", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="dasd-fba", RUN+="/sbin/dasdconf.sh"
|
||||||
|
|
||||||
|
# This list should be autogenerated with "modinfo dasd_{eckd,fba}_mod"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t1750m*dt3380dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t1750m*dt3390dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t2107m*dt3380dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t2107m*dt3390dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t9343m*dt9345dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t2105m*dt3380dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t3990m*dt3380dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t3880m*dt3390dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t2105m*dt3390dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t3990m*dt3390dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t3880m*dt3370dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
|
ACTION=="add", SUBSYSTEM=="ccw", ATTR{modalias}=="ccw:t6310m*dt9336dm*", RUN+="/sbin/dasdconf.sh"
|
||||||
94
SOURCES/dasdconf.sh
Normal file
94
SOURCES/dasdconf.sh
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# config file syntax:
|
||||||
|
# deviceno sysfs_opts...
|
||||||
|
#
|
||||||
|
# Examples:
|
||||||
|
# 0.0.0203 readonly=1 failfast=1
|
||||||
|
# 0.0.0204
|
||||||
|
# 0.0.0205 erplog=1
|
||||||
|
|
||||||
|
[ -z "$DEVPATH" ] && exit 0
|
||||||
|
[ "$ACTION" != "add" ] && exit 0
|
||||||
|
|
||||||
|
CHANNEL=${DEVPATH##*/}
|
||||||
|
|
||||||
|
CONFIG=/etc/dasd.conf
|
||||||
|
PATH=/sbin:/bin
|
||||||
|
export PATH
|
||||||
|
|
||||||
|
warn() {
|
||||||
|
[ -e /dev/kmsg ] && echo "<4>dasdconf.sh Warning: $@" > /dev/kmsg
|
||||||
|
echo "dasdconf.sh Warning: $@" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -f "$CONFIG" ]; then
|
||||||
|
if [ ! -d /sys/bus/ccw/drivers/dasd-eckd ] && [ ! -d /sys/bus/ccw/drivers/dasd-fba ]; then
|
||||||
|
#warn "No dasd-eckd or dasd-eckd loaded"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
||||||
|
case $line in
|
||||||
|
\#*) ;;
|
||||||
|
*)
|
||||||
|
[ -z "$line" ] && continue
|
||||||
|
set $line
|
||||||
|
|
||||||
|
# if we are in single add mode, only add the new CHANNEL
|
||||||
|
[ "$SUBSYSTEM" = "ccw" ] && [ "$1" != "$CHANNEL" ] && continue
|
||||||
|
|
||||||
|
DEVICE=$1
|
||||||
|
SYSFSPATH=
|
||||||
|
|
||||||
|
if [ -r "/sys/bus/ccw/drivers/dasd-eckd/$DEVICE" ]; then
|
||||||
|
SYSFSPATH="/sys/bus/ccw/drivers/dasd-eckd/$DEVICE"
|
||||||
|
elif [ -r "/sys/bus/ccw/drivers/dasd-fba/$DEVICE" ]; then
|
||||||
|
SYSFSPATH="/sys/bus/ccw/drivers/dasd-fba/$DEVICE"
|
||||||
|
else
|
||||||
|
# if we are in single add mode, this is a failure!
|
||||||
|
[ "$SUBSYSTEM" = "ccw" ] && warn "Could not find $DEVICE in sysfs"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# skip already onlined devices
|
||||||
|
if [ "$(cat $SYSFSPATH/online)" = "1" ]; then
|
||||||
|
if [ "$SUBSYSTEM" = "ccw" ]; then
|
||||||
|
# if we are in single add mode, we should not touch the device
|
||||||
|
warn "$DEVICE is already online, not configuring"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
shift
|
||||||
|
while [ -n "$1" ]; do
|
||||||
|
(
|
||||||
|
attribute="$1"
|
||||||
|
IFS="="
|
||||||
|
set $attribute
|
||||||
|
|
||||||
|
if [ "$1" = "use_diag" ]; then
|
||||||
|
# this module better only returns after
|
||||||
|
# all sysfs entries have the "use_diag" file
|
||||||
|
modprobe dasd_diag_mod
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -r "$SYSFSPATH/$1" ]; then
|
||||||
|
echo $2 > $SYSFSPATH/$1 || warn "Could not set $1=$2 for $DEVICE"
|
||||||
|
else
|
||||||
|
warn "$1 does not exist for $DEVICE"
|
||||||
|
fi
|
||||||
|
)
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# Now, put the device online
|
||||||
|
echo 1 > $SYSFSPATH/online || echo "Could not activate $DEVICE"
|
||||||
|
|
||||||
|
# if we are in single add mode, we are done
|
||||||
|
[ "$SUBSYSTEM" = "ccw" ] && exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
313
SOURCES/device_cio_free
Normal file
313
SOURCES/device_cio_free
Normal file
@ -0,0 +1,313 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright 2009, 2010 Red Hat, Inc.
|
||||||
|
# License: GPLv2
|
||||||
|
# Author: Dan Horák <dhorak@redhat.com>
|
||||||
|
#
|
||||||
|
# unblock devices listed in various config files and wait until they are ready
|
||||||
|
#
|
||||||
|
# it uses dasd and zfcp config file
|
||||||
|
# config file syntax:
|
||||||
|
# deviceno options
|
||||||
|
# or
|
||||||
|
# deviceno WWPN FCPLUN
|
||||||
|
#
|
||||||
|
# also processes the system ccw config file and network interface configurations
|
||||||
|
#
|
||||||
|
# requires: echo, sleep, modprobe, grep, printf, sed.
|
||||||
|
#
|
||||||
|
# it is used in
|
||||||
|
# anaconda
|
||||||
|
# dracut generated initramfs
|
||||||
|
# normal system startup driven by upstart
|
||||||
|
#
|
||||||
|
|
||||||
|
DASDCONFIG=/etc/dasd.conf
|
||||||
|
ZFCPCONFIG=/etc/zfcp.conf
|
||||||
|
ZNETCONFIG=/etc/ccw.conf
|
||||||
|
BLACKLIST=/proc/cio_ignore
|
||||||
|
CIO_SETTLE=/proc/cio_settle
|
||||||
|
VERBOSE=
|
||||||
|
PATH=/bin:/sbin
|
||||||
|
DEVICE= # list of devices given on command line
|
||||||
|
ALL_DEVICES= # list of all unblocked devices
|
||||||
|
WAITING_TIMEOUT=60 # maximum time to wait for all devices to appear
|
||||||
|
WAITING_TOTAL=0 # actual time spent waiting for devices
|
||||||
|
|
||||||
|
usage()
|
||||||
|
{
|
||||||
|
echo "Usage: $CMD [-h|--help] [-V|--verbose] [-d|--device <deviceid>]"
|
||||||
|
echo " -h|--help print this message"
|
||||||
|
echo " -V|--verbose be verbose"
|
||||||
|
echo " -d|--device <deviceid> unblock and wait for specified device"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# accepts single device, comma-separated lists and dash separated ranges and their combinations
|
||||||
|
# the comma separated list is split so we minimize the effect of unsuccessful freeing
|
||||||
|
free_device()
|
||||||
|
{
|
||||||
|
local DEV DEV_LIST
|
||||||
|
|
||||||
|
[ -z "$1" ] && return
|
||||||
|
|
||||||
|
DEV_LIST=$(echo "$1" | sed 'y/ABCDEF/abcdef/' | sed 's/,/ /g')
|
||||||
|
|
||||||
|
for DEV in $DEV_LIST; do
|
||||||
|
[ $VERBOSE ] && echo "Freeing device(s) $DEV"
|
||||||
|
if ! echo "free $DEV" > $BLACKLIST 2> /dev/null ; then
|
||||||
|
echo "Error: can't free device(s) $DEV"
|
||||||
|
else
|
||||||
|
if [ -z $ALL_DEVICES ]; then
|
||||||
|
ALL_DEVICES="$DEV"
|
||||||
|
else
|
||||||
|
ALL_DEVICES="$ALL_DEVICES,$DEV"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# wait until a device appears on the ccw bus
|
||||||
|
wait_on_single_device()
|
||||||
|
{
|
||||||
|
local DEVICE_ONLINE DEV
|
||||||
|
|
||||||
|
[ -z "$1" ] && return
|
||||||
|
|
||||||
|
DEV="$1"
|
||||||
|
DEVICE_ONLINE="/sys/bus/ccw/devices/$DEV/online"
|
||||||
|
|
||||||
|
[ $VERBOSE ] && echo "Waiting on device $DEV"
|
||||||
|
[ -f "$DEVICE_ONLINE" ] && return
|
||||||
|
|
||||||
|
for t in 1 2 3 4 5
|
||||||
|
do
|
||||||
|
if [ $WAITING_TOTAL -ge $WAITING_TIMEOUT ]; then
|
||||||
|
[ $VERBOSE ] && echo "Waiting timeout of $WAITING_TIMEOUT seconds reached"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
WAITING_TOTAL=$(($WAITING_TOTAL + $t))
|
||||||
|
[ $VERBOSE ] && echo "Waiting additional $t second(s) and $WAITING_TOTAL second(s) in total"
|
||||||
|
sleep $t
|
||||||
|
[ -f "$DEVICE_ONLINE" ] && return
|
||||||
|
done
|
||||||
|
echo "Error: device $DEV still not ready"
|
||||||
|
}
|
||||||
|
|
||||||
|
# wait until recently unblocked devices are ready
|
||||||
|
# at this point we know the content of ALL_DEVICES is syntacticly correct
|
||||||
|
wait_on_devices()
|
||||||
|
{
|
||||||
|
if [ -w $CIO_SETTLE ]; then
|
||||||
|
[ $VERBOSE ] && echo "Waiting until all pending CIO requests are processed"
|
||||||
|
echo 1 > $CIO_SETTLE
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
OLD_IFS=$IFS
|
||||||
|
IFS=","
|
||||||
|
set $ALL_DEVICES
|
||||||
|
for DEV in $*
|
||||||
|
do
|
||||||
|
IFS="."
|
||||||
|
|
||||||
|
# get the lower bound for range or get the single device
|
||||||
|
LOWER=${DEV%%-*}
|
||||||
|
set $LOWER
|
||||||
|
if [ $# -eq 1 ]; then
|
||||||
|
L0=0
|
||||||
|
L1=0
|
||||||
|
L2=$(printf "%d" "0x$1")
|
||||||
|
else
|
||||||
|
L0=$(printf "%d" "0x$1")
|
||||||
|
L1=$(printf "%d" "0x$2")
|
||||||
|
L2=$(printf "%d" "0x$3")
|
||||||
|
fi
|
||||||
|
|
||||||
|
# get the upper bound for range or get the single device
|
||||||
|
UPPER=${DEV##*-}
|
||||||
|
set $UPPER
|
||||||
|
if [ $# -eq 1 ]; then
|
||||||
|
U0=0
|
||||||
|
U1=0
|
||||||
|
U2=$(printf "%d" "0x$1")
|
||||||
|
else
|
||||||
|
U0=$(printf "%d" "0x$1")
|
||||||
|
U1=$(printf "%d" "0x$2")
|
||||||
|
U2=$(printf "%d" "0x$3")
|
||||||
|
fi
|
||||||
|
|
||||||
|
IFS=$OLD_IFS
|
||||||
|
|
||||||
|
# iterate thru all devices
|
||||||
|
i=$L0
|
||||||
|
while [ $i -le $U0 ]; do
|
||||||
|
[ $i -eq $L0 ] && LJ=$L1 || LJ=0
|
||||||
|
[ $i -eq $U0 ] && UJ=$U1 || UJ=3
|
||||||
|
|
||||||
|
j=$LJ
|
||||||
|
while [ $j -le $UJ ]; do
|
||||||
|
[ $i -eq $L0 -a $j -eq $L1 ] && LK=$L2 || LK=0
|
||||||
|
[ $i -eq $U0 -a $j -eq $U1 ] && UK=$U2 || UK=65535
|
||||||
|
|
||||||
|
k=$LK
|
||||||
|
while [ $k -le $UK ]; do
|
||||||
|
wait_on_single_device "$(printf %x.%x.%04x $i $j $k)"
|
||||||
|
k=$(($k + 1))
|
||||||
|
done
|
||||||
|
j=$(($j + 1))
|
||||||
|
done
|
||||||
|
i=$(($i + 1))
|
||||||
|
done
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
process_config_file()
|
||||||
|
{
|
||||||
|
local CONFIG
|
||||||
|
|
||||||
|
[ -z "$1" ] && return
|
||||||
|
|
||||||
|
CONFIG="$1"
|
||||||
|
if [ -f "$CONFIG" ]; then
|
||||||
|
while read line; do
|
||||||
|
case $line in
|
||||||
|
\#*) ;;
|
||||||
|
*)
|
||||||
|
[ -z "$line" ] && continue
|
||||||
|
set $line
|
||||||
|
free_device $1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done < "$CONFIG"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# check how we were called
|
||||||
|
CMD=${0##*/}
|
||||||
|
DIR=${0%/*}
|
||||||
|
ARGS=$@
|
||||||
|
case $CMD in
|
||||||
|
"dasd_cio_free")
|
||||||
|
MODE_DASD="yes"
|
||||||
|
;;
|
||||||
|
"zfcp_cio_free")
|
||||||
|
MODE_ZFCP="yes"
|
||||||
|
;;
|
||||||
|
"znet_cio_free")
|
||||||
|
MODE_ZNET="yes"
|
||||||
|
;;
|
||||||
|
"device_cio_free")
|
||||||
|
MODE_DASD="yes"
|
||||||
|
MODE_ZFCP="yes"
|
||||||
|
MODE_ZNET="yes"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Error: unknown alias '$CMD'."
|
||||||
|
echo "Supported aliases are dasd_cio_free, zfcp_cio_free and znet_cio_free."
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# process command line options
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
-V|--verbose)
|
||||||
|
VERBOSE=yes
|
||||||
|
;;
|
||||||
|
-h|--help)
|
||||||
|
usage
|
||||||
|
;;
|
||||||
|
-d|--device)
|
||||||
|
shift
|
||||||
|
if [ "$1" ]; then
|
||||||
|
if [ "$DEVICE" ]; then
|
||||||
|
DEVICE="$DEVICE,$1"
|
||||||
|
else
|
||||||
|
DEVICE=$1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Error: no device given"
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Error: unknown option $1"
|
||||||
|
usage
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ ! -f $BLACKLIST ]; then
|
||||||
|
echo "Error: $BLACKLIST kernel interface doesn't exist"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$DEVICE" ]; then
|
||||||
|
[ $VERBOSE ] && echo "Freeing specific devices"
|
||||||
|
free_device $DEVICE
|
||||||
|
wait_on_devices
|
||||||
|
udevadm settle
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $VERBOSE ]; then
|
||||||
|
echo -n "Freeing devices:"
|
||||||
|
[ $MODE_DASD ] && echo -n " dasd"
|
||||||
|
[ $MODE_ZFCP ] && echo -n " zfcp"
|
||||||
|
[ $MODE_ZNET ] && echo -n " znet"
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
|
||||||
|
[ $MODE_DASD ] && process_config_file $DASDCONFIG
|
||||||
|
[ $MODE_ZFCP ] && process_config_file $ZFCPCONFIG
|
||||||
|
|
||||||
|
if [ $MODE_DASD ]; then
|
||||||
|
# process the device list defined as option for the dasd module
|
||||||
|
DEVICES=$(modprobe --showconfig | LANG=C grep "options[[:space:]]\+dasd_mod" | \
|
||||||
|
sed -e 's/.*[[:space:]]dasd=\([^[:space:]]*\).*/\1/' -e 's/([^)]*)//g' \
|
||||||
|
-e 's/nopav\|nofcx\|autodetect\|probeonly//g' -e 's/,,/,/g' -e 's/^,//' -e 's/,$//')
|
||||||
|
|
||||||
|
for DEVRANGE in $(echo $DEVICES | sed 's/,/ /g'); do
|
||||||
|
free_device $DEVRANGE
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $MODE_ZNET ]; then
|
||||||
|
# process the config file
|
||||||
|
if [ -f "$ZNETCONFIG" ]; then
|
||||||
|
while read line; do
|
||||||
|
case $line in
|
||||||
|
\#*) ;;
|
||||||
|
*)
|
||||||
|
[ -z "$line" ] && continue
|
||||||
|
# grep 2 or 3 channels from each "<nettype>,<subchannels>,<options>" line
|
||||||
|
DEVICES=$(echo $line | LANG=C grep -E -i -o "([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)")
|
||||||
|
free_device $DEVICES
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done < "$ZNETCONFIG"
|
||||||
|
fi
|
||||||
|
# process channels from network interface configurations
|
||||||
|
if [ -z "$__sed_discard_ignored_files" ]; then
|
||||||
|
if [ -f /etc/init.d/functions ]; then
|
||||||
|
. /etc/init.d/functions
|
||||||
|
else
|
||||||
|
# default value copied from initscripts 9.03.10
|
||||||
|
__sed_discard_ignored_files='/\(~\|\.bak\|\.orig\|\.rpmnew\|\.rpmorig\|\.rpmsave\)$/d'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
for line in $(LANG=C grep -E -i -h \
|
||||||
|
"^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){1,2}([0-9]\.[0-9]\.[a-f0-9]+)['\"]?([[:space:]]+#|[[:space:]]*$)" \
|
||||||
|
$( (ls /etc/sysconfig/network-scripts/ifcfg-* 2> /dev/null || echo "__no_config_file") | \
|
||||||
|
LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
|
||||||
|
do
|
||||||
|
eval "$line"
|
||||||
|
free_device $SUBCHANNELS
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
[ -z "$ALL_DEVICES" ] && exit 0
|
||||||
|
|
||||||
|
wait_on_devices
|
||||||
13
SOURCES/device_cio_free.service
Normal file
13
SOURCES/device_cio_free.service
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Free all devices on startup
|
||||||
|
DefaultDependencies=no
|
||||||
|
Before=sysinit.target systemd-udev-trigger.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
ExecStart=/usr/sbin/device_cio_free
|
||||||
|
StandardOutput=syslog
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=sysinit.target
|
||||||
120
SOURCES/normalize_dasd_arg
Normal file
120
SOURCES/normalize_dasd_arg
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright 2012 Red Hat, Inc.
|
||||||
|
# License: GPLv2
|
||||||
|
# Author: Jesse Keating <jkeating@redhat.com>
|
||||||
|
#
|
||||||
|
# Normalize DASD data into valid dasd.conf format
|
||||||
|
#
|
||||||
|
# Standard input should be the DASD argument
|
||||||
|
# Standard otuput is the properly formatted content
|
||||||
|
#
|
||||||
|
# it is used in
|
||||||
|
# dracut generated initramfs
|
||||||
|
#
|
||||||
|
# Much of this code was salvaged from linuxrc.s390 from Anaconda:
|
||||||
|
#
|
||||||
|
# License GPLv2+
|
||||||
|
#
|
||||||
|
# Copyright (C) 2000-2004 by
|
||||||
|
# Bernhard Rosenkraenzer <bero@redhat.com>
|
||||||
|
# Oliver Paukstadt <opaukstadt@millenux.com>
|
||||||
|
# Karsten Hopp <karsten@redhat.de>
|
||||||
|
# Florian La Roche <laroche@redhat.com>
|
||||||
|
# Nils Philippsen <nils@redhat.de>
|
||||||
|
# Helge Deller <hdeller@redhat.de>
|
||||||
|
# David Sainty <dsainty@redhat.com>
|
||||||
|
# Copyright (C) IBM Corp. 2008,2009
|
||||||
|
# Author: Steffen Maier <maier@de.ibm.com>
|
||||||
|
|
||||||
|
|
||||||
|
function canonicalize_devno()
|
||||||
|
{
|
||||||
|
case ${#1} in
|
||||||
|
3) echo "0.0.0${1}" ;;
|
||||||
|
4) echo "0.0.${1}" ;;
|
||||||
|
*) echo "${1}" ;;
|
||||||
|
esac
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
read DASD
|
||||||
|
# See if we've gotten a format like <dev>,feature or <dev>,<dev>,<dev>
|
||||||
|
[[ "$DASD" =~ (\,*=[[:digit:]]) ]]
|
||||||
|
case $? in
|
||||||
|
# case of 0 is features, just turn the comma into a space
|
||||||
|
0) echo $DASD |sed 's/,/ /g';;
|
||||||
|
*) # We've got no features, do things normally
|
||||||
|
for dasditem in $(echo $DASD |sed 's/,/ /g')
|
||||||
|
do
|
||||||
|
unset range features lo hi attrs devno lodevno hidevno devbusid sys
|
||||||
|
case $dasditem in
|
||||||
|
autodetect|probeonly|nopav|nofcx|"") continue ;; # these don't gen a config
|
||||||
|
*)
|
||||||
|
IFS='('
|
||||||
|
read range features <<< "$dasditem"
|
||||||
|
unset IFS
|
||||||
|
lo=${range%%-*}
|
||||||
|
[[ "$lo" =~ (^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$)|(^[[:xdigit:]]{3,4}$) ]]
|
||||||
|
case $? in
|
||||||
|
0) # string matched the pattern
|
||||||
|
lo=$(canonicalize_devno $lo) ;;
|
||||||
|
1) # string did not match the pattern
|
||||||
|
echo $"Incorrect format for lower bound of DASD range $range: $lo" 1>&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
2) echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 ;;
|
||||||
|
*) echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
if [ "${range//*-*/}" = "" ]; then
|
||||||
|
hi=${range##*-}
|
||||||
|
[[ "$hi" =~ (^[[:xdigit:]]+\.[0-3]\.[[:xdigit:]]{4}$)|(^[[:xdigit:]]{3,4}$) ]]
|
||||||
|
case $? in
|
||||||
|
0) # string matched the pattern
|
||||||
|
hi=$(canonicalize_devno $hi)
|
||||||
|
if [ "${lo%.*}" != "${hi%.*}" ]; then
|
||||||
|
echo $"Prefixes of DASD range $range do not match: ${lo%.*} != ${hi%.*}" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
1) # string did not match the pattern
|
||||||
|
echo $"Incorrect format for upper bound of DASD range $range: $hi" 1>&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
2) echo "l.$LINENO: syntax error in regex of match operator =~, code needs to be fixed" 1>&2 ;;
|
||||||
|
*) echo "l.$LINENO: unexpected return code of regex match operator =~, code needs to be fixed" 1>&2 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
if [ "${features//*)/}" != "" ]; then
|
||||||
|
echo $"Missing closing parenthesis at features of DASD range $range: ($features" 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ -n "$features" ]; then
|
||||||
|
attrs=""
|
||||||
|
features="${features%)}"
|
||||||
|
for feature in $(echo $features |sed 's/:/\n/g'); do
|
||||||
|
case $feature in
|
||||||
|
ro) attrs=$attrs" readonly" ;;
|
||||||
|
diag) attrs=$attrs" use_diag" ;;
|
||||||
|
erplog|failfast) attrs=$attrs" "$feature ;;
|
||||||
|
*) echo $"Unknown DASD feature for device range $range: $feature" 1>&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
[ -z "$hi" ] && hi=$lo
|
||||||
|
lodevno=$((0x${lo##*.}))
|
||||||
|
hidevno=$((0x${hi##*.}))
|
||||||
|
for ((devno=$lodevno; $devno <= $hidevno; ++devno)); do
|
||||||
|
devbusid=$(printf "%s.%04x" ${lo%.*} $devno)
|
||||||
|
echo -n "$devbusid"
|
||||||
|
for attr in $attrs; do
|
||||||
|
echo -n " $attr=1"
|
||||||
|
done
|
||||||
|
echo
|
||||||
|
done
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
22895
SOURCES/s390-tools-rhel.patch
Normal file
22895
SOURCES/s390-tools-rhel.patch
Normal file
File diff suppressed because it is too large
Load Diff
146
SOURCES/s390-tools-zipl-bls-loadaddr.patch
Normal file
146
SOURCES/s390-tools-zipl-bls-loadaddr.patch
Normal file
@ -0,0 +1,146 @@
|
|||||||
|
From ecf5a4ecb909bfd91306678d0c460ab2f2837a33 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
|
Date: Mon, 18 Nov 2019 04:10:06 -0500
|
||||||
|
Subject: [PATCH 1/3] zipl: drop redundant string duplication
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||||
|
---
|
||||||
|
zipl/src/scan.c | 9 +--------
|
||||||
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index 38fa5454..0ea37efa 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -1575,7 +1575,6 @@ scan_check_bls(struct scan_token *scan)
|
||||||
|
int i, rc;
|
||||||
|
char *target_value = NULL;
|
||||||
|
char *img_value = NULL;
|
||||||
|
- char *buffer = NULL;
|
||||||
|
/*
|
||||||
|
* In the BLS case, each BLS section heading inherits a keyword
|
||||||
|
* assignment target= from zipl.conf, and they are all the same.
|
||||||
|
@@ -1609,14 +1608,8 @@ scan_check_bls(struct scan_token *scan)
|
||||||
|
scan[i].content.keyword.value);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
- buffer = (char *)
|
||||||
|
- misc_malloc(strlen(img_value) + 1);
|
||||||
|
- if (buffer == NULL)
|
||||||
|
- return -1;
|
||||||
|
- memcpy(buffer, img_value, strlen(img_value));
|
||||||
|
- buffer[strlen(img_value)] = 0;
|
||||||
|
free(scan[i].content.keyword.value);
|
||||||
|
- scan[i].content.keyword.value = buffer;
|
||||||
|
+ scan[i].content.keyword.value = img_value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
From 05f83569960e2774e819fe0942da1f92d0cce35b Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
|
Date: Mon, 18 Nov 2019 04:29:04 -0500
|
||||||
|
Subject: [PATCH 2/3] zipl: set reason not text for failed check
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||||
|
---
|
||||||
|
zipl/src/scan.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index 0ea37efa..0f01cac9 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -1603,7 +1603,7 @@ scan_check_bls(struct scan_token *scan)
|
||||||
|
scan[i].content.keyword.value);
|
||||||
|
rc = misc_check_readable_file(img_value);
|
||||||
|
if (rc) {
|
||||||
|
- error_text(
|
||||||
|
+ error_reason(
|
||||||
|
"Image file '%s' is not accessible",
|
||||||
|
scan[i].content.keyword.value);
|
||||||
|
return rc;
|
||||||
|
|
||||||
|
From 8ab552b430f109d80966d0c56bed0d204d917d30 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||||
|
Date: Mon, 18 Nov 2019 11:45:50 -0500
|
||||||
|
Subject: [PATCH 3/3] zipl: fix handling of values with load address in BLS
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Various keywords (like image or ramdisk) allow specifying a load address
|
||||||
|
as an optional argument. Adapt the logic for checking the presence of
|
||||||
|
the files to take this into the account.
|
||||||
|
|
||||||
|
Fixes: https://github.com/ibm-s390-tools/s390-tools/commit/d71628326d80e623fc9f008fe4ea93edb5592b2e
|
||||||
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1772054
|
||||||
|
|
||||||
|
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||||
|
---
|
||||||
|
zipl/src/scan.c | 32 ++++++++++++++++++++++++++------
|
||||||
|
1 file changed, 26 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index 0f01cac9..a34edf62 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -1575,6 +1575,8 @@ scan_check_bls(struct scan_token *scan)
|
||||||
|
int i, rc;
|
||||||
|
char *target_value = NULL;
|
||||||
|
char *img_value = NULL;
|
||||||
|
+ char *file = NULL;
|
||||||
|
+ char *tmp, *value;
|
||||||
|
/*
|
||||||
|
* In the BLS case, each BLS section heading inherits a keyword
|
||||||
|
* assignment target= from zipl.conf, and they are all the same.
|
||||||
|
@@ -1595,19 +1597,37 @@ scan_check_bls(struct scan_token *scan)
|
||||||
|
if (scan[i].content.keyword.keyword == scan_keyword_image ||
|
||||||
|
scan[i].content.keyword.keyword == scan_keyword_ramdisk) {
|
||||||
|
|
||||||
|
- rc = misc_check_readable_file(
|
||||||
|
- scan[i].content.keyword.value);
|
||||||
|
+ value = scan[i].content.keyword.value;
|
||||||
|
+ /*
|
||||||
|
+ * put the filename only into the file var before
|
||||||
|
+ * checking its presence
|
||||||
|
+ */
|
||||||
|
+ if (contains_address(value)) {
|
||||||
|
+ tmp = strrchr(value, ',');
|
||||||
|
+ file = strndup(value, tmp - value);
|
||||||
|
+ } else {
|
||||||
|
+ file = value;
|
||||||
|
+ }
|
||||||
|
+ rc = misc_check_readable_file(file);
|
||||||
|
if (rc) {
|
||||||
|
misc_asprintf(&img_value, "%s%s",
|
||||||
|
- target_value,
|
||||||
|
- scan[i].content.keyword.value);
|
||||||
|
+ target_value, file);
|
||||||
|
rc = misc_check_readable_file(img_value);
|
||||||
|
if (rc) {
|
||||||
|
error_reason(
|
||||||
|
- "Image file '%s' is not accessible",
|
||||||
|
- scan[i].content.keyword.value);
|
||||||
|
+ "File '%s' not accessible", file);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
+ /*
|
||||||
|
+ * when file has stripped the load address part,
|
||||||
|
+ * do generate a prefixed value
|
||||||
|
+ */
|
||||||
|
+ if (file != value) {
|
||||||
|
+ free(file);
|
||||||
|
+ free(img_value);
|
||||||
|
+ misc_asprintf(&img_value, "%s%s",
|
||||||
|
+ target_value, value);
|
||||||
|
+ }
|
||||||
|
free(scan[i].content.keyword.value);
|
||||||
|
scan[i].content.keyword.value = img_value;
|
||||||
|
}
|
||||||
84
SOURCES/s390-tools-zipl-invert-script-options.patch
Normal file
84
SOURCES/s390-tools-zipl-invert-script-options.patch
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
From 2faae5cf51c49e3f166b8526eee276dab2fe7308 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
Date: Wed, 30 May 2018 14:33:25 +0200
|
||||||
|
Subject: [PATCH] zipl-switch-to-blscfg: invert ignore-default and
|
||||||
|
use-version-name options
|
||||||
|
|
||||||
|
These options were added because the zipl maintainers wanted a different
|
||||||
|
default behaviour for the migration script than the one we use. Instead
|
||||||
|
of requiring to always use these options, just invert the logic for us.
|
||||||
|
|
||||||
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
||||||
|
---
|
||||||
|
scripts/zipl-switch-to-blscfg | 16 +++++++++-------
|
||||||
|
scripts/zipl-switch-to-blscfg.1 | 8 ++++----
|
||||||
|
2 files changed, 13 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/zipl-switch-to-blscfg b/scripts/zipl-switch-to-blscfg
|
||||||
|
index 871935c783f..d8d5eca5867 100755
|
||||||
|
--- a/scripts/zipl-switch-to-blscfg
|
||||||
|
+++ b/scripts/zipl-switch-to-blscfg
|
||||||
|
@@ -57,14 +57,14 @@ Options:
|
||||||
|
--backup-suffix=SUFFIX suffix used for backup files, defaults to .bak
|
||||||
|
--bls-directory=DIR path to generate BLS files, defaults to /boot/loader/entries
|
||||||
|
--config-file=FILE path to zipl configuration file, defaults to /etc/zipl.conf
|
||||||
|
- --ignore-default ignore the default option from the zipl configuration file
|
||||||
|
- --use-version-name use the section kernel version as the BLS file name
|
||||||
|
+ --leave-default leave the default option from the zipl configuration file
|
||||||
|
+ --use-section-name use the section name as the BLS file name
|
||||||
|
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
OPTS="$(getopt -o hv --long help,version,backup-suffix:,bls-directory:,config-file:,\
|
||||||
|
-ignore-default,use-version-name -n \'$SCRIPTNAME\' -- "$@")"
|
||||||
|
+leave-default,use-section-name -n \'$SCRIPTNAME\' -- "$@")"
|
||||||
|
eval set -- "$OPTS"
|
||||||
|
|
||||||
|
BACKUP_SUFFIX=.bak
|
||||||
|
@@ -73,6 +73,8 @@ CMDLINE_LINUX_DEBUG=" systemd.log_level=debug systemd.log_target=kmsg"
|
||||||
|
LINUX_DEBUG_VERSION_POSTFIX="_with_debugging"
|
||||||
|
LINUX_DEBUG_TITLE_POSTFIX=" with debugging"
|
||||||
|
CONFIG="/etc/zipl.conf"
|
||||||
|
+ignore_default=true
|
||||||
|
+version_name=true
|
||||||
|
|
||||||
|
while [ ${#} -gt 0 ]; do
|
||||||
|
case "$1" in
|
||||||
|
@@ -96,11 +98,11 @@ while [ ${#} -gt 0 ]; do
|
||||||
|
CONFIG=${2}
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
- --ignore-default)
|
||||||
|
- ignore_default=true
|
||||||
|
+ --leave-default)
|
||||||
|
+ ignore_default=false
|
||||||
|
;;
|
||||||
|
- --use-version-name)
|
||||||
|
- version_name=true
|
||||||
|
+ --use-section-name)
|
||||||
|
+ version_name=false
|
||||||
|
;;
|
||||||
|
--)
|
||||||
|
shift
|
||||||
|
diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
|
||||||
|
index 6bd14d00d14..71b904ffd1c 100644
|
||||||
|
--- a/scripts/zipl-switch-to-blscfg.1
|
||||||
|
+++ b/scripts/zipl-switch-to-blscfg.1
|
||||||
|
@@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
|
||||||
|
The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
-\fB\-\-ignore-default\fP
|
||||||
|
-Ignore the default option from the zipl configuration file
|
||||||
|
+\fB\-\-leave-default\fP
|
||||||
|
+Leave the default option from the zipl configuration file
|
||||||
|
|
||||||
|
.TP
|
||||||
|
-\fB\-\-use-version-name\fP
|
||||||
|
-Use the section kernel version as the BLS file name
|
||||||
|
+\fB\-\-use-section-name\fP
|
||||||
|
+Use the section name as the BLS file name
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
147
SOURCES/s390-tools-zipl-sort-like-rpm.patch
Normal file
147
SOURCES/s390-tools-zipl-sort-like-rpm.patch
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
From 8ec7b75204f3c7bf691e14b89c73c5dd28d2a824 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Jones <pjones@redhat.com>
|
||||||
|
Date: Mon, 15 Oct 2018 13:54:16 -0400
|
||||||
|
Subject: [PATCH] blscfg: sort like rpm nvr, not like a single version
|
||||||
|
|
||||||
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||||
|
---
|
||||||
|
zipl/src/scan.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||||
|
zipl/src/Makefile | 3 +-
|
||||||
|
2 files changed, 96 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||||
|
index fe72e9ab13d..63186222783 100644
|
||||||
|
--- a/zipl/src/scan.c
|
||||||
|
+++ b/zipl/src/scan.c
|
||||||
|
@@ -33,6 +33,8 @@
|
||||||
|
|
||||||
|
#include "lib/util_base.h"
|
||||||
|
|
||||||
|
+#include <rpm/rpmlib.h>
|
||||||
|
+
|
||||||
|
#include "boot.h"
|
||||||
|
#include "error.h"
|
||||||
|
#include "misc.h"
|
||||||
|
@@ -652,14 +654,104 @@ bls_filter(const struct dirent *ent)
|
||||||
|
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* returns name/version/release */
|
||||||
|
+/* NULL string pointer returned if nothing found */
|
||||||
|
+static void
|
||||||
|
+split_package_string (char *package_string, char **name,
|
||||||
|
+ char **version, char **release)
|
||||||
|
+{
|
||||||
|
+ char *package_version, *package_release;
|
||||||
|
+
|
||||||
|
+ /* Release */
|
||||||
|
+ package_release = strrchr (package_string, '-');
|
||||||
|
+
|
||||||
|
+ if (package_release != NULL)
|
||||||
|
+ *package_release++ = '\0';
|
||||||
|
+
|
||||||
|
+ *release = package_release;
|
||||||
|
+
|
||||||
|
+ /* Version */
|
||||||
|
+ package_version = strrchr(package_string, '-');
|
||||||
|
+
|
||||||
|
+ if (package_version != NULL)
|
||||||
|
+ *package_version++ = '\0';
|
||||||
|
+
|
||||||
|
+ *version = package_version;
|
||||||
|
+ /* Name */
|
||||||
|
+ *name = package_string;
|
||||||
|
+
|
||||||
|
+ /* Bubble up non-null values from release to name */
|
||||||
|
+ if (name != NULL && *name == NULL) {
|
||||||
|
+ *name = (*version == NULL ? *release : *version);
|
||||||
|
+ *version = *release;
|
||||||
|
+ *release = NULL;
|
||||||
|
+ }
|
||||||
|
+ if (*version == NULL) {
|
||||||
|
+ *version = *release;
|
||||||
|
+ *release = NULL;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int
|
||||||
|
+split_cmp(char *nvr0, char *nvr1, int has_name)
|
||||||
|
+{
|
||||||
|
+ int ret = 0;
|
||||||
|
+ char *name0, *version0, *release0;
|
||||||
|
+ char *name1, *version1, *release1;
|
||||||
|
+
|
||||||
|
+ split_package_string(nvr0, has_name ? &name0 : NULL, &version0, &release0);
|
||||||
|
+ split_package_string(nvr1, has_name ? &name1 : NULL, &version1, &release1);
|
||||||
|
+
|
||||||
|
+ if (has_name) {
|
||||||
|
+ ret = rpmvercmp(name0 == NULL ? "" : name0,
|
||||||
|
+ name1 == NULL ? "" : name1);
|
||||||
|
+ if (ret != 0)
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ret = rpmvercmp(version0 == NULL ? "" : version0,
|
||||||
|
+ version1 == NULL ? "" : version1);
|
||||||
|
+ if (ret != 0)
|
||||||
|
+ return ret;
|
||||||
|
+
|
||||||
|
+ ret = rpmvercmp(release0 == NULL ? "" : release0,
|
||||||
|
+ release1 == NULL ? "" : release1);
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* return 1: filename0 is newer than filename1 */
|
||||||
|
+/* 0: filename0 and filename1 are the same version */
|
||||||
|
+/* -1: filename1 is newer than filename0 */
|
||||||
|
+static int bls_cmp(const char *filename0, const char *filename1)
|
||||||
|
+{
|
||||||
|
+ char *id0, *id1;
|
||||||
|
+ int l, r;
|
||||||
|
+
|
||||||
|
+ id0 = strdup(filename0);
|
||||||
|
+ id1 = strdup(filename1);
|
||||||
|
+
|
||||||
|
+ l = strlen(id0);
|
||||||
|
+ if (l > 5 && strcmp(id0 + l - 5, ".conf"))
|
||||||
|
+ id0[l-5] = '\0';
|
||||||
|
+
|
||||||
|
+ l = strlen(id1);
|
||||||
|
+ if (l > 5 && strcmp(id1 + l - 5, ".conf"))
|
||||||
|
+ id1[l-5] = '\0';
|
||||||
|
+
|
||||||
|
+ r = split_cmp(id0, id1, 1);
|
||||||
|
+
|
||||||
|
+ free(id0);
|
||||||
|
+ free(id1);
|
||||||
|
+
|
||||||
|
+ return r;
|
||||||
|
+}
|
||||||
|
|
||||||
|
static int
|
||||||
|
bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||||
|
{
|
||||||
|
- return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
|
||||||
|
+ return bls_cmp((*ent_a)->d_name, (*ent_b)->d_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
static int
|
||||||
|
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
||||||
|
static int
|
||||||
|
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
|
||||||
|
index 1634c0d5121..bc797990652 100644
|
||||||
|
--- a/zipl/src/Makefile
|
||||||
|
+++ b/zipl/src/Makefile
|
||||||
|
@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
|
||||||
|
-D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
|
||||||
|
ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||||
|
|
||||||
|
-libs = $(rootdir)/libutil/libutil.a
|
||||||
|
+libs = $(rootdir)/libutil/libutil.a -lrpm
|
||||||
|
|
||||||
|
objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
|
||||||
|
install.o zipl.o $(rootdir)/zipl/boot/data.o
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
1
SOURCES/zfcp.udev
Normal file
1
SOURCES/zfcp.udev
Normal file
@ -0,0 +1 @@
|
|||||||
|
KERNEL=="zfcp", RUN+="/sbin/zfcpconf.sh"
|
||||||
56
SOURCES/zfcpconf.sh
Normal file
56
SOURCES/zfcpconf.sh
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# config file syntax:
|
||||||
|
# deviceno WWPN FCPLUN
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# 0.0.4000 0x5005076300C213e9 0x5022000000000000
|
||||||
|
# 0.0.4001 0x5005076300c213e9 0x5023000000000000
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# manual setup:
|
||||||
|
# modprobe zfcp
|
||||||
|
# echo 1 > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
|
||||||
|
# echo LUN > /sys/bus/ccw/drivers/zfcp/0.0.4000/WWPN/unit_add
|
||||||
|
#
|
||||||
|
# Example:
|
||||||
|
# modprobe zfcp
|
||||||
|
# echo 1 > /sys/bus/ccw/drivers/zfcp/0.0.4000/online
|
||||||
|
# echo 0x5022000000000000 > /sys/bus/ccw/drivers/zfcp/0.0.4000/0x5005076300c213e9/unit_add
|
||||||
|
|
||||||
|
CONFIG=/etc/zfcp.conf
|
||||||
|
PATH=/bin:/sbin
|
||||||
|
|
||||||
|
if [ -f "$CONFIG" ]; then
|
||||||
|
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||||
|
modprobe zfcp
|
||||||
|
fi
|
||||||
|
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
||||||
|
case $line in
|
||||||
|
\#*) ;;
|
||||||
|
*)
|
||||||
|
[ -z "$line" ] && continue
|
||||||
|
set $line
|
||||||
|
if [ $# -eq 5 ]; then
|
||||||
|
DEVICE=$1
|
||||||
|
SCSIID=$2
|
||||||
|
WWPN=$3
|
||||||
|
SCSILUN=$4
|
||||||
|
FCPLUN=$5
|
||||||
|
echo "Warning: Deprecated values in /etc/zfcp.conf, ignoring SCSI ID $SCSIID and SCSI LUN $SCSILUN"
|
||||||
|
elif [ $# -eq 3 ]; then
|
||||||
|
DEVICE=${1##*0x}
|
||||||
|
WWPN=$2
|
||||||
|
FCPLUN=$3
|
||||||
|
fi
|
||||||
|
[ `cat /sys/bus/ccw/drivers/zfcp/${DEVICE}/online` = "0" ] \
|
||||||
|
&& echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
|
||||||
|
[ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/${FCPLUN} ] \
|
||||||
|
&& echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/unit_add
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
1840
SPECS/s390utils.spec
Normal file
1840
SPECS/s390utils.spec
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user