From b900bfe5a536065665f6575aaa84b0615db856dc Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@volny.cz>
Date: Tue, 25 Jul 2006 02:36:49 +0000
Subject: GRE and IPIP tunnel support (#168990, based on patches by Razvan
 Corneliu C.R. Vilt <razvan.vilt@linux360.ro>, Aaron Hope <aaron.hope@unh.edu>
 and Sean Millichamp <sean@enertronllc.com>)

check_device_down: Handle tunnel_device@NONE: <...>
---
 sysconfig/network-scripts/network-functions | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sysconfig/network-scripts/network-functions')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index aea5f0c9..eb2ce1c8 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -92,7 +92,9 @@ source_config ()
 	IUCV)
 		DEVICETYPE="iucv"
 		;;
-
+	GRE | IPIP)
+		DEVICETYPE="tunnel"
+		;;
     esac
     [ -z "$DEVICETYPE" ] && DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"`
     [ -z "$REALDEVICE" -a -n "$PARENTDEVICE" ] && REALDEVICE=$PARENTDEVICE
@@ -254,7 +256,7 @@ check_device_down ()
 	  return 0
      fi
     else 
-     if LC_ALL=C ip -o link 2>/dev/null | grep -q "$1:.*,UP" ; then
+     if LC_ALL=C ip -o link 2>/dev/null | grep -q "$1[:@].*,UP" ; then
 	return 1
      else
 	return 0
-- 
cgit