aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-04-19 09:54:43 +0000
committerBill Nottingham <notting@redhat.com>2002-04-19 09:54:43 +0000
commit4ab8bf026daad8dc93116f400288a29f9fd44928 (patch)
tree5ae36acfc8c990f72834c0612253494783f58f33
parentfbadc537fbd5ede31bc3793ab4f8a3919a201c97 (diff)
downloadinitscripts-4ab8bf026daad8dc93116f400288a29f9fd44928.tar
initscripts-4ab8bf026daad8dc93116f400288a29f9fd44928.tar.gz
initscripts-4ab8bf026daad8dc93116f400288a29f9fd44928.tar.bz2
initscripts-4ab8bf026daad8dc93116f400288a29f9fd44928.tar.xz
initscripts-4ab8bf026daad8dc93116f400288a29f9fd44928.zip
back this out for now... i'm paranoid
-rwxr-xr-xsysconfig/network-scripts/ifup22
1 files changed, 9 insertions, 13 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index 98277ab9..219dcfde 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -91,8 +91,6 @@ is_available ${REALDEVICE} || {
exit 0
fi
}
-
-
if [ -n "${HWADDR}" ]; then
FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} | \
sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'`
@@ -104,12 +102,6 @@ if [ -n "${HWADDR}" ]; then
fi
fi
-# finished initialization, let's start to bring the device up.
-if ! ip link set ${REALDEVICE} up ; then
- echo $"Failed to bring up ${DEVICE}."
- exit 1
-fi
-
# is the device wireless? If so, configure wireless device specifics
is_wireless_device ${DEVICE} && . ./ifup-wireless
@@ -179,10 +171,10 @@ if [ -n "${DYNCONFIG}" ]; then
fi
[ -n "$FWHACK" ] && ipchains -D input -s 0/0 53 -d 0/0 1025:65535 -p udp -j ACCEPT
-else
- # static configuration
-
+else
if [ -z "${IPADDR}" ]; then
+ # enable device without IP, useful for e.g. PPPoE
+ ip link set ${REALDEVICE} up
if [ "${NETWORKING_IPV6}" = "yes" ]; then
/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
fi
@@ -196,6 +188,11 @@ else
$(toggle_value promisc $PROMISC) \
$(toggle_value allmulti $ALLMULTI)
+ if ! ip link set ${REALDEVICE} up ; then
+ echo $"Failed to bring up ${DEVICE}."
+ exit 1
+ fi
+
if ! arping -q -c 2 -w 3 -D -I ${REALDEVICE} ${IPADDR} ; then
echo $"Error, some other host already uses address ${IPADDR}."
exit 1
@@ -250,9 +247,8 @@ if [ "${NETWORKING_IPV6}" = "yes" ]; then
/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
fi
-# IPX initialization?
if [ "${IPX}" = yes ]; then
- /etc/sysconfig/network-scripts/ifup-ipx ${DEVICE}
+ /etc/sysconfig/network-scripts/ifup-ipx ${DEVICE}
fi
exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}