From 90af582957edbedc7035acf32eb98c3e68a5d802 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 8 Oct 2004 17:12:59 +0000 Subject: - remove check for SYSDIR/portname, this file isn't available with LCS devices. --- ChangeLog | 5 +++++ initscripts.spec | 5 ++++- sysconfig/network-scripts/network-functions | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1acf65f2..6d371e47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-08 Karsten Hopp + * ChangeLog, initscripts.spec: 7.90-1 + + * sysconfig/network-scripts/network-functions: fix portname for LCS devices + 2004-10-07 Florian La Roche * ChangeLog, initscripts.spec: 7.89-1 diff --git a/initscripts.spec b/initscripts.spec index a5a77a98..2371aa4e 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.89 +Version: 7.90 License: GPL Group: System Environment/Base Release: 1 @@ -206,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Oct 08 2004 Karsten Hopp 7.90-1 +- fix portname for LCS devices + * Thu Oct 07 2004 Florian La Roche - change /etc/sysctl.conf to not allow source routed packets per default diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index e4f9ab79..249978a6 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -339,7 +339,7 @@ configure_ccwgroup_device () SYSDIR="$DIR/${SUBCHANNELS//,*/}" [ ! -e $DIR/group ] && return echo "$SUBCHANNELS" > $DIR/group - if [ -n "$PORTNAME" -a -e $SYSDIR/portname ]; then + if [ -n "$PORTNAME" ]; then if [ "$NETTYPE" = "lcs" ]; then [ -e $SYSDIR/portno ] && echo "$PORTNAME" > $SYSDIR/portno else -- cgit v1.2.1