aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rw-r--r--sysconfig/network-scripts/network-functions16
2 files changed, 8 insertions, 14 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 05566180..e65a3de7 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.74
+Version: 7.75
License: GPL
Group: System Environment/Base
Release: 1
@@ -207,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Wed Sep 01 2004 Karsten Hopp <karsten@redhat.de> 7.75-1
+- fix sysfs configuration of qeth and lcs network interfaces
+ (eth, tr, hsi)
+
* Mon Aug 30 2004 Karsten Hopp <karsten@redhat.de> 7.74-1
- fix support for LCS portnumbers (mainframe)
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 8d14a780..a424a73c 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -331,23 +331,13 @@ configure_ccwgroup_device ()
{
local DIR SYSDIR
# SUBCHANNELS is only set on mainframe ccwgroup devices
- [ -z "$SUBCHANNELS" ] && return
- if [ "$TYPE" = "QETH" ]; then
- DIR="/sys/bus/ccwgroup/drivers/qeth"
- elif
- [ "$TYPE" = "CTC" ]; then
- DIR="/sys/bus/ccwgroup/drivers/ctc"
- elif
- [ "$TYPE" = "LCS" ]; then
- DIR="/sys/bus/ccwgroup/drivers/lcs"
- else
- return
- fi
+ [ -z "$SUBCHANNELS" -o -z "$NETTYPE" ] && return
+ DIR="/sys/bus/ccwgroup/drivers/$NETTYPE"
SYSDIR="$DIR/${SUBCHANNELS//,*/}"
[ ! -e $DIR/group ] && return
echo "$SUBCHANNELS" > $DIR/group
if [ -n "$PORTNAME" -a -e $SYSDIR/portname ]; then
- if [ "$TYPE" = "LCS" ]; then
+ if [ "$NETTYPE" = "lcs" ]; then
[ -e $SYSDIR/portno ] && echo "$PORTNAME" > $SYSDIR/portno
else
[ -e $SYSDIR/portname ] && echo "$PORTNAME" > $SYSDIR/portname