aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-05-02 16:55:27 +0000
committerBill Nottingham <notting@redhat.com>2003-05-02 16:55:27 +0000
commit643df6d908ab65de6dbf164f469e98a1de639e9f (patch)
tree5213b1647539ed62b798172ff7437bc2819aadee /sysconfig/network-scripts
parentc3c42594656687b4cd38d81bca9d5841e65ba4d9 (diff)
downloadinitscripts-643df6d908ab65de6dbf164f469e98a1de639e9f.tar
initscripts-643df6d908ab65de6dbf164f469e98a1de639e9f.tar.gz
initscripts-643df6d908ab65de6dbf164f469e98a1de639e9f.tar.bz2
initscripts-643df6d908ab65de6dbf164f469e98a1de639e9f.tar.xz
initscripts-643df6d908ab65de6dbf164f469e98a1de639e9f.zip
some minor cleanups
Diffstat (limited to 'sysconfig/network-scripts')
-rwxr-xr-xsysconfig/network-scripts/ifup12
1 files changed, 6 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index bc412043..e1d655b3 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -56,8 +56,8 @@ fi
# figure out more about what we are dealing with
DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"`
-[ -z "$REALDEVICE" ] && REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
-if echo ${DEVICE} | grep -q ':' ; then
+[ -z "$REALDEVICE" ] && REALDEVICE=${DEVICE%%:*}
+if [ "${DEVICE}" != "${REALDEVICE}" ]; then
ISALIAS=yes
else
ISALIAS=no
@@ -190,7 +190,7 @@ fi
# Is there a firewall running, and does it look like one we configured?
FWACTIVE=
-if iptables -L -n 2>/dev/null | grep -q RH-Lokkit-0-50-INPUT ; then
+if iptables -L -n 2>/dev/null | LC_ALL=C grep -q RH-Lokkit-0-50-INPUT ; then
FWACTIVE=1
else
modprobe -r iptable_filter >/dev/null 2>&1
@@ -198,7 +198,7 @@ fi
# Remove any temporary references which were previously added to dhclient config
if [ -w /etc/dhclient-${DEVICE}.conf ] && [ -x /sbin/dhclient ] ; then
- grep -v "# temporary RHL ifup addition" /etc/dhclient-${DEVICE}.conf > /etc/dhclient-${DEVICE}.conf.ifupnew 2> /dev/null
+ LC_ALL=C grep -v "# temporary RHL ifup addition" /etc/dhclient-${DEVICE}.conf > /etc/dhclient-${DEVICE}.conf.ifupnew 2> /dev/null
cat /etc/dhclient-${DEVICE}.conf.ifupnew > /etc/dhclient-${DEVICE}.conf
rm -f /etc/dhclient-${DEVICE}.conf.ifupnew
fi
@@ -213,7 +213,7 @@ if [ -n "${DYNCONFIG}" ]; then
DHCPCDARGS="${DHCPCDARGS} -h ${DHCP_HOSTNAME}"
if [ -x /sbin/dhclient ] ; then
if [ -w /etc/dhclient-${DEVICE}.conf ] ; then
- if ! grep "send *host-name *\"${DHCP_HOSTNAME}\"" /etc/dhclient-${DEVICE}.conf > /dev/null 2>&1 ; then
+ if ! LC_ALL=C grep "send *host-name *\"${DHCP_HOSTNAME}\"" /etc/dhclient-${DEVICE}.conf > /dev/null 2>&1 ; then
echo "send host-name \"${DHCP_HOSTNAME}\"; # temporary RHL ifup addition" >> /etc/dhclient-${DEVICE}.conf
fi
elif ! [ -e /etc/dhclient-${DEVICE}.conf ] ; then
@@ -306,7 +306,7 @@ else
SRC=
fi
- if ! LC_ALL=C ip addr ls ${REALDEVICE} | grep -q "${IPADDR}/${PREFIX}" ; then
+ if ! LC_ALL=C ip addr ls ${REALDEVICE} | LC_ALL=C 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}."