diff options
| author | Bill Nottingham <notting@redhat.com> | 2002-03-12 17:51:04 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2002-03-12 17:51:04 +0000 |
| commit | a3c8e9c92b8a97f32dca7084db9591e2cd432f58 (patch) | |
| tree | fa3cdd1e6f70114ec3034675e220b552e2c43ef1 | |
| parent | 2b4ff54e220b94aba363506ef62a8aa4c5979dc5 (diff) | |
| download | initscripts-a3c8e9c92b8a97f32dca7084db9591e2cd432f58.tar initscripts-a3c8e9c92b8a97f32dca7084db9591e2cd432f58.tar.gz initscripts-a3c8e9c92b8a97f32dca7084db9591e2cd432f58.tar.bz2 initscripts-a3c8e9c92b8a97f32dca7084db9591e2cd432f58.tar.xz initscripts-a3c8e9c92b8a97f32dca7084db9591e2cd432f58.zip | |
revert LVS-related changes
| -rw-r--r-- | sysconfig.txt | 3 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 18 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 04c313de..be7ac832 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -506,7 +506,6 @@ Files in /etc/sysconfig/network-scripts/ DEVICE=<name of physical device (except dynamically-allocated PPP devices where it is the "logical name")> IPADDR= - SRCADDR= NETMASK= GATEWAY= ONBOOT=yes|no @@ -521,8 +520,6 @@ Files in /etc/sysconfig/network-scripts/ file if PEERDNS is not set to "no". FIREWALL_MODS=yes|no modify firewall to attempt to allow DNS through. Defaults to 'yes'. - SRCADDR= - use the specified source address for outgoing packets If BOOTPROTO is not "none", then the only other item that must be set is the DEVICE item; all the rest will be determined diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 219dcfde..aeb6a302 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -203,23 +203,13 @@ else else SCOPE= fi - - if [ -n "$SRCADDR" ]; then - SRC="src $SRCADDR" - else - SRC= - fi - + if ! LC_ALL=C ip addr ls ${REALDEVICE} | grep -q "${IPADDR}/${PREFIX}" ; then if ! ip addr add ${IPADDR}/${PREFIX} \ brd ${BROADCAST:-+} dev ${REALDEVICE} ${SCOPE} label ${DEVICE}; then echo $"Error adding address ${IPADDR} for ${DEVICE}." fi fi - - if [ -n "$SRCADDR" ]; then - sysctl -w "net.ipv4.conf.${REALDEVICE}.arp_filter=1" >/dev/null 2>&1 - fi # update ARP cache of neighboring computers arping -q -A -c 1 -I ${REALDEVICE} ${IPADDR} @@ -228,16 +218,16 @@ else # Add a route for the subnet. Replace any existing route. if [ "${ISALIAS}" = no ]; then - ip route replace ${NETWORK}/${PREFIX} ${SRC} dev ${REALDEVICE} + ip route replace ${NETWORK}/${PREFIX} dev ${REALDEVICE} fi # Set a default route. if [ -z "${GATEWAYDEV}" -o "${GATEWAYDEV}" = "${REALDEVICE}" ]; then # set up default gateway if [ -n "${GATEWAY}" -a "`ipcalc --network ${GATEWAY} ${NETMASK} 2>/dev/null`" = "NETWORK=${NETWORK}" ]; then - ip route add default via ${GATEWAY} ${SRC} + ip route add default via ${GATEWAY} elif [ "${GATEWAYDEV}" = "${DEVICE}" ]; then - ip route add default ${SRC} dev ${REALDEVICE} + ip route add default dev ${REALDEVICE} fi fi fi |