aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Hopp <karsten@redhat.com>2004-10-08 17:12:59 +0000
committerKarsten Hopp <karsten@redhat.com>2004-10-08 17:12:59 +0000
commit90af582957edbedc7035acf32eb98c3e68a5d802 (patch)
treeedd21191b51610c5060af0196ddc8e49147532b1
parent7cd727319a98cf6f3935221709c531c1283f5dfb (diff)
downloadinitscripts-r7-90.tar
initscripts-r7-90.tar.gz
initscripts-r7-90.tar.bz2
initscripts-r7-90.tar.xz
initscripts-r7-90.zip
- remove check for SYSDIR/portname, this file isn't available withr7-90
LCS devices.
-rw-r--r--ChangeLog5
-rw-r--r--initscripts.spec5
-rw-r--r--sysconfig/network-scripts/network-functions2
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 <karsten@redhat.com>
+ * ChangeLog, initscripts.spec: 7.90-1
+
+ * sysconfig/network-scripts/network-functions: fix portname for LCS devices
+
2004-10-07 Florian La Roche <laroche@redhat.com>
* 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 <karsten@redhat.de> 7.90-1
+- fix portname for LCS devices
+
* Thu Oct 07 2004 Florian La Roche <Florian.LaRoche@redhat.de>
- 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