Attachment 716934 Details for Bug 928232 – initscripts-9.42.2-ipip6-tunnel.patch

[patch] initscripts-9.42.2-ipip6-tunnel.patch

initscripts-9.42.2-ipip6-tunnel.patch (text/plain), 2.53 KB, created by Alexey I. Froloff on 2013-03-27 08:32:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey I. Froloff

Created: 2013-03-27 08:32:46 UTC

Size: 2.53 KB

patch

obsolete

>diff --git i/sysconfig.txt w/sysconfig.txt
>index 7746671..4ab8aaf 100644
>--- i/sysconfig.txt
>+++ w/sysconfig.txt
>@@ -932,7 +932,7 @@ Files in /etc/sysconfig/network-scripts/
>       "mode=active-backup arp_interval=60 arp_ip_target=192.168.1.1,192.168.1.2"
> 
>   Tunnel-specific items:
>-    TYPE=GRE|IPIP
>+    TYPE=GRE|IPIP|IPIP6
>     MY_INNER_IPADDR=local IP address of the tunnel interface
>     PEER_OUTER_IPADDR=IP address of the remote tunnel endpoint
>     MY_OUTER_IPADDR=IP address of the local tunnel endpoint
>diff --git i/sysconfig/network-scripts/ifdown-tunnel w/sysconfig/network-scripts/ifdown-tunnel
>index 2853a0a..110050c 100755
>--- i/sysconfig/network-scripts/ifdown-tunnel
>+++ w/sysconfig/network-scripts/ifdown-tunnel
>@@ -32,7 +32,7 @@ need_config "$CONFIG"
> source_config
> 
> # Generic tunnel devices are not supported here
>-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
>+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
>     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
>     exit 1
> fi
>diff --git i/sysconfig/network-scripts/ifup-tunnel w/sysconfig/network-scripts/ifup-tunnel
>index c14e065..95e368a 100755
>--- i/sysconfig/network-scripts/ifup-tunnel
>+++ w/sysconfig/network-scripts/ifup-tunnel
>@@ -39,12 +39,19 @@ fi
> case "$TYPE" in
>     GRE)
> 	MODE=gre
>+	proto=-4
> 	/sbin/modprobe ip_gre
> 	;;
>     IPIP)
> 	MODE=ipip
>+	proto=-4
> 	/sbin/modprobe ipip
> 	;;
>+    IPIP6)
>+	MODE=ipip6
>+	proto=-6
>+	/sbin/modprobe ip6_tunnel
>+	;;
>     *)
> 	net_log $"Invalid tunnel type $TYPE"
> 	exit 1
>@@ -52,14 +59,14 @@ case "$TYPE" in
> esac
> 
> # Generic tunnel devices are not supported here
>-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
>+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
>     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
>     exit 1
> fi
> 
> # Create the tunnel
> # The outer addresses are those of the underlying (public) network.
>-/sbin/ip tunnel add "$DEVICE" mode "$MODE" \
>+/sbin/ip $proto tunnel add "$DEVICE" mode "$MODE" \
>     ${MY_OUTER_IPADDR:+local "$MY_OUTER_IPADDR"} \
>     ${PEER_OUTER_IPADDR:+remote "$PEER_OUTER_IPADDR"} \
>     ${KEY:+key "$KEY"} ${TTL:+ttl "$TTL"}
>diff --git i/sysconfig/network-scripts/network-functions w/sysconfig/network-scripts/network-functions
>index 2602301..56e3f14 100644
>--- i/sysconfig/network-scripts/network-functions
>+++ w/sysconfig/network-scripts/network-functions
>@@ -141,7 +141,7 @@ source_config ()
> 	CTC)
> 		DEVICETYPE="ctc"
> 		;;
>-	GRE | IPIP)
>+	GRE | IPIP | IPIP6)
> 		DEVICETYPE="tunnel"
> 		;;
> 	SIT | sit)

Actions: View | Diff

Attachments on bug 928232: 716934