remove $Id$ lines

[projects/rc-scripts.git] / lib / functions.network

diff --git a/lib/functions.network b/lib/functions.network
index 6b03d4b82c2fb94e2227d3262b08e8cb8733d30a..f873086727ccfb652f405afc467214a6980ab3e1 100644 (file)
--- a/lib/functions.network
+++ b/lib/functions.network
@@ -1,6 +1,5 @@
 #!/bin/sh - keep it for file(1) to get bourne shell script result
 #
-# $Id$
 #
 # This is not a shell script; it provides functions to network scripts
 # that source it.
@@ -73,7 +72,7 @@ set_hostname()
        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 +256,7 @@ setup_ip_param ()
 
 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 +512,7 @@ setup_ip_rules ()
 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 +605,8 @@ check_mii_tool ()
 {
        [ -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 +618,8 @@ check_ethtool ()
 {
        [ -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 +638,7 @@ check_iwconfig ()
        [ -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
 }
@@ -658,9 +657,9 @@ check_link_down ()
                return 2
        fi
 
-       [ -z "$max_timeout" ] && max_timeout=6
+       [ -z "$max_timeout" ] && max_timeout=10
 
-       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