Dan Horák 2020-10-07 15:09:59 +02:00
parent 2f9ebbc0ab
commit 1b35631849
3 changed files with 28 additions and 2 deletions

View File

@ -35,6 +35,14 @@ get_config_by_subchannel ()
| LC_ALL=C sed -e "$__sed_discard_ignored_files" | LC_ALL=C sed -e "$__sed_discard_ignored_files"
} }
get_config_by_subchannel_nm ()
{
LANG=C grep -E -i -l \
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){0,2}${1};([0-9]\.[0-9]\.[a-f0-9]+;){0,2}$" \
/etc/NetworkManager/system-connections/*.nmconnection \
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
}
CHANNEL=${DEVPATH##*/} CHANNEL=${DEVPATH##*/}
if [ $MODE = "dracut" ]; then if [ $MODE = "dracut" ]; then
@ -64,9 +72,16 @@ elif [ $MODE = "normal" ]; then
if [ -n "$CONFIG_FILE" ]; then if [ -n "$CONFIG_FILE" ]; then
. $CONFIG_FILE . $CONFIG_FILE
else
CONFIG_FILE=$(get_config_by_subchannel_nm $CHANNEL)
if [ -n "$CONFIG_FILE" ]; 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)
else else
exit 1 exit 1
fi fi
fi
else else
echo "Unknown mode=$MODE" echo "Unknown mode=$MODE"
exit 1 exit 1

View File

@ -306,6 +306,14 @@ if [ $MODE_ZNET ]; then
eval "$line" eval "$line"
free_device $SUBCHANNELS free_device $SUBCHANNELS
done done
for line in $(LANG=C grep -E -i -h \
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){2,3}$" \
$( (ls /etc/NetworkManager/system-connections/*.nmconnection 2> /dev/null || echo "__no_config_file") | \
LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
do
SUBCHANNELS="$(echo $line | sed -e "s/s390-subchannels=//" -e "s/;/,/g")"
free_device $SUBCHANNELS
done
fi fi
[ -z "$ALL_DEVICES" ] && exit 0 [ -z "$ALL_DEVICES" ] && exit 0

View File

@ -6,7 +6,7 @@
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.14.0 Version: 2.14.0
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 2 Epoch: 2
License: MIT License: MIT
ExclusiveArch: s390 s390x ExclusiveArch: s390 s390x
@ -792,6 +792,9 @@ User-space development files for the s390/s390x architecture.
%changelog %changelog
* Wed Oct 07 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-4
- update scripts for https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh
* Mon Sep 21 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-3 * Mon Sep 21 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-3
- rebuilt for net-snmp 5.9 - rebuilt for net-snmp 5.9