diff options
author | Bill Nottingham <notting@redhat.com> | 2009-03-20 12:02:14 -0400 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2011-04-19 16:28:49 +0200 |
commit | bc618f58f7c44a74c41328c35454f3584eab6ff9 (patch) | |
tree | d1d0a85bdb8261568e65dbbda2b9147b299629dd | |
parent | c32b123a33e430bc0f02e4f921ab6184734bbdc5 (diff) | |
download | initscripts-bc618f58f7c44a74c41328c35454f3584eab6ff9.tar initscripts-bc618f58f7c44a74c41328c35454f3584eab6ff9.tar.gz initscripts-bc618f58f7c44a74c41328c35454f3584eab6ff9.tar.bz2 initscripts-bc618f58f7c44a74c41328c35454f3584eab6ff9.tar.xz initscripts-bc618f58f7c44a74c41328c35454f3584eab6ff9.zip |
Don't exit out on IPv4 address-free interfaces; just follow the normal exit path. (#486507)
[Harald Hoyer <harald@redhat.com>: backport of eb389d6]
For example, this allows DHCPv6 to run.
-rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 3e5f199f..f58192a5 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -233,12 +233,7 @@ else /sbin/ethtool -s ${REALDEVICE} $ETHTOOL_OPTS fi [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY} - - if [ "${NETWORKING_IPV6}" = "yes" ]; then - /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} - fi - exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2} - fi + else expand_config @@ -300,6 +295,7 @@ else ${SRC} ${WINDOW:+window $WINDOW} dev ${REALDEVICE} fi fi + fi fi # Add Zeroconf route. |