diff options
| author | Miloslav Trmac <mitr@volny.cz> | 2006-07-25 02:36:49 +0000 |
|---|---|---|
| committer | Miloslav Trmac <mitr@volny.cz> | 2006-07-25 02:36:49 +0000 |
| commit | b900bfe5a536065665f6575aaa84b0615db856dc (patch) | |
| tree | ffa2914f8d9d99c70f8c023aa6d0912232d09f6f /sysconfig/network-scripts/network-functions | |
| parent | 8ebf0a43d2df1b47d6404d33518c1654d740cf73 (diff) | |
| download | initscripts-b900bfe5a536065665f6575aaa84b0615db856dc.tar initscripts-b900bfe5a536065665f6575aaa84b0615db856dc.tar.gz initscripts-b900bfe5a536065665f6575aaa84b0615db856dc.tar.bz2 initscripts-b900bfe5a536065665f6575aaa84b0615db856dc.tar.xz initscripts-b900bfe5a536065665f6575aaa84b0615db856dc.zip | |
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: <...>
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 6 |
1 files changed, 4 insertions, 2 deletions
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 |