aboutsummaryrefslogtreecommitdiffstats
path: root/sysconfig/network-scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-02-15 12:31:32 -0500
committerBill Nottingham <notting@redhat.com>2010-02-15 12:31:32 -0500
commitae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f (patch)
tree109e74b07f521bd859c29bb58e647ff60bba5bba /sysconfig/network-scripts
parentd31d3856a58d48595d7fc9bd31448245d81e6762 (diff)
downloadinitscripts-ae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f.tar
initscripts-ae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f.tar.gz
initscripts-ae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f.tar.bz2
initscripts-ae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f.tar.xz
initscripts-ae8fd2bc5fe2dd42ecfa848123b261ec3e6b261f.zip
Make sure we default to 'ok' if link checking fails.
Diffstat (limited to 'sysconfig/network-scripts')
-rw-r--r--sysconfig/network-scripts/network-functions2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 02a024a4..89baeb45 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -253,7 +253,7 @@ check_link_down ()
delay=10
[ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2))
while [ $timeout -le $delay ]; do
- [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1
+ [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1
usleep 500000
timeout=$((timeout+1))
done
-m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) ARCH := $(patsubst arm%,arm,$(ARCH)) # DEBUG = 1 #- default frontend is newt (honoured by main Makefile whenever possible) ifdef DEBUG F = STDIO else F = NEWT endif # diet libc syscalls are broken on mips ifneq (mips, $(ARCH)) # diet libc eabi support is mostly broken ifneq (arm, $(ARCH)) DIET = $(shell test -x /usr/bin/diet && echo diet) endif endif ifeq ($(DIET), diet) #- default lib is dietlibc (honoured by main Makefile whenever possible) L = DIETLIBC else L = GLIBC endif ifdef DEBUG OPTFLAGS = -g -DDEBUG else OPTFLAGS = -Os endif #- flags used by all stuff CFLAGS = $(OPTFLAGS) -pipe -Wall -fomit-frame-pointer -fno-strict-aliasing ifneq (ppc, $(ARCH)) ifneq (sparc, $(ARCH)) CFLAGS += -Werror endif endif DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I. DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a GLIBC_INCLUDES = -I. INCLUDES = $($(L)_INCLUDES) GLIBC_LDFLAGS = -static LDFLAGS = $($(L)_LDFLAGS) STAGE1_LIBC = $($(L)_LIBC) ifdef DEBUG STRIPCMD = echo not stripping else STRIPCMD = strip -R .note -R .comment endif