rpms/s390utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- ccw_init - handle portno option in NM configs and use DRIVER environment variable

Browse Source 
Resolves: RHEL-76751
This commit is contained in:
Dan Horák 2026-06-08 11:50:05 +02:00
parent 384a4f1d5e
commit 5ef1e14c14
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ccw_init
View File

@ -1,6 +1,7 @@
#! /bin/sh
[ -z "$DEVPATH" ] && exit 0
[ -z "$DRIVER" ] && exit 0
[ "$SUBSYSTEM" != "ccw" ] && exit 0
[ -e /etc/ccw.conf ] && MODE="dracut" || MODE="normal"
@ -78,6 +79,7 @@ elif [ $MODE = "normal" ]; then
NETTYPE=$(sed -nr "/^\[ethernet\]/ { :l /^s390-nettype[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
SUBCHANNELS=$(sed -nr "/^\[ethernet\]/ { :l /^s390-subchannels[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE | sed -e "s/;/,/g" -e "s/,$//")
LAYER2=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^layer2[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
PORTNO=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^portno[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
else
exit 1
fi
@ -115,6 +117,10 @@ if [ "$NETTYPE" = "ctc" -a -n "$CTCPROT" ]; then
OPTIONS="$OPTIONS protocol=$CTCPROT"
fi
if [ -n "$PORTNO" ]; then
OPTIONS="$OPTIONS portno=$PORTNO"
fi
# SUBCHANNELS is only set on mainframe ccwgroup devices
[ -z "$SUBCHANNELS" -o -z "$NETTYPE" ] && exit 0
if [ "$NETTYPE" = "ctc" ]; then
@ -148,8 +154,6 @@ if [ -e $SYSDIR/online ]; then
[ "$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

3
s390utils.spec
View File

@ -1130,7 +1130,8 @@ User-space development files for the s390/s390x architecture.
- SEL-EBC: instrumentation of an SEL initramfs to support early boot customization (RHEL-136434)
- SEL-EBC: tool to build basic SEL-qcow2 image supporting early boot customization (RHEL-136437)
- KVM: Enhance pvimg info command to display additional SE image information (RHEL-73137)
- Resolves: RHEL-174896 RHEL-166158 RHEL-169659 RHEL-136434 RHEL-136437 RHEL-73137
- Cannot configure "portno" of the network interface (RHEL-76751)
- Resolves: RHEL-174896 RHEL-166158 RHEL-169659 RHEL-136434 RHEL-136437 RHEL-73137 RHEL-76751
* Wed Apr 08 2026 Dan Horák <dhorak@redhat.com> - 2:2.41.0-1
- rebased to 2.41.0 (RHEL-136098)