diff options
| author | Karsten Hopp <karsten@redhat.com> | 2004-09-10 10:37:38 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.com> | 2004-09-10 10:37:38 +0000 |
| commit | 1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba (patch) | |
| tree | 185c84a50f882ea218127193299a284ba39ef18f | |
| parent | 711a27c0713c36f58ae4259366bfe98bb62e9d7b (diff) | |
| download | initscripts-1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba.tar initscripts-1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba.tar.gz initscripts-1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba.tar.bz2 initscripts-1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba.tar.xz initscripts-1129c1b2ff3ff4a2d9c5ae7cc390e401f42f51ba.zip | |
- CTC uses GATEWAY as pointtopoint partner. This works as long as CTCr7-79
is the primary network interface, but fails otherwise.
Load /etc/sysconfig/network before ifcfg-ctcX so that GATEWAY can be
set in ifcfg-ctcX and doesn't get overwritten.
| -rw-r--r-- | initscripts.spec | 8 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ctc | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index efab6479..2724e4b2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,9 +1,9 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.78 +Version: 7.79 License: GPL Group: System Environment/Base -Release: 2 +Release: 1 Source: initscripts-%{version}.tar.bz2 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/ Patch0: initscripts-s390.patch @@ -205,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Sep 10 2004 Karsten Hopp <karsten@redhat.com> - 7.79-1 +- load ctc device config after /etc/sysconfig/network so that + GATEWAY doesn't get overwritten + * Wed Sep 8 2004 Dan Walsh <dwalshg@redhat.com> - 7.78-2 - fix setting SELinux contexts on udev-created-in-initrd devices - Let restorecon check if selinux is enabled. diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc index beead387..193c11b5 100755 --- a/sysconfig/network-scripts/ifup-ctc +++ b/sysconfig/network-scripts/ifup-ctc @@ -13,6 +13,8 @@ cd /etc/sysconfig/network-scripts . network-functions +. /etc/sysconfig/network + CONFIG=$1 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG source_config @@ -25,8 +27,6 @@ fi configure_ccwgroup_device -. /etc/sysconfig/network - ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${GATEWAY} netmask ${NETMASK} # Wait for the device to come up - the chandev'ified ctc driver can take |