Author: glen
Date: Fri May 31 01:48:45 2013
New Revision: 12689
Modified:
rc-scripts/trunk/lib/functions.network
Log:
grep fixed strings where appropriate
Modified: rc-scripts/trunk/lib/functions.network
==============================================================================
--- rc-scripts/trunk/lib/functions.network (original)
+++ rc-scripts/trunk/lib/functions.network Fri May 31 01:48:45 2013
@@ -73,7 +73,7 @@
if [ "$domain" ]; then
# XXX umask and possible /etc/resolv.conf symlink breakage
> /etc/resolv.conf.new
- if ! grep -q "search $domain" /etc/resolv.conf; then
+ if ! grep -Fq "search $domain" /etc/resolv.conf; then
echo "search $domain" >> /etc/resolv.conf.new
fi
echo "domain $domain" >> /etc/resolv.conf.new
@@ -257,7 +257,7 @@
check_device_down ()
{
- if LC_ALL=C ip link show dev ${DEVICE} 2> /dev/null | grep -q UP; then
+ if LC_ALL=C ip link show dev ${DEVICE} 2> /dev/null | grep -Fq UP; then
return 1
else
return 0
@@ -513,7 +513,7 @@
is_wireless_device ()
{
if [ -x /sbin/iwconfig ]; then
- LC_ALL=C iwconfig "${1}" 2>&1 | grep -q "no wireless
extensions" || return 0
+ LC_ALL=C iwconfig "${1}" 2>&1 | grep -Fq "no wireless
extensions" || return 0
fi
return 1
}
@@ -606,8 +606,8 @@
{
[ -x /sbin/mii-tool ] || return 2
local output=$(LC_ALL=C mii-tool $1 2>&1)
- echo $output | grep -q "link ok" && return 1
- echo $output | grep -q "no link" && return 0
+ echo $output | grep -Fq "link ok" && return 1
+ echo $output | grep -Fq "no link" && return 0
return 2
}
@@ -619,8 +619,8 @@
{
[ -x /sbin/ethtool ] || return 2
local output=$(LC_ALL=C ethtool $1 2>&1)
- echo $output | grep -q "Link detected: yes" && return 1
- echo $output | grep -q "Link detected: no" && return 0
+ echo $output | grep -Fq "Link detected: yes" && return 1
+ echo $output | grep -Fq "Link detected: no" && return 0
return 2
}
@@ -639,7 +639,7 @@
[ -x /sbin/iwconfig ] || return 2
output=$(LC_ALL=C iwconfig "$1" 2>&1)
# "radio off" is ipwxxx only "feature" (and there is no "radio on")
- echo "$output" | grep -q "radio off" && return 0
+ echo "$output" | grep -Fq "radio off" && return 0
# XXX: need more generic checks for wifi
return 2
}
@@ -660,7 +660,7 @@
[ -z "$max_timeout" ] && max_timeout=6
- if ! LC_ALL=C ip link show dev $device 2>/dev/null | grep -q UP; then
+ if ! LC_ALL=C ip link show dev $device 2>/dev/null | grep -Fq UP; then
ip link set dev $device up >/dev/null 2>&1
emit net-device-up IFACE=$device
fi
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
