diff options
| -rw-r--r-- | doc/sysconfig.txt | 2 | ||||
| -rwxr-xr-x | network-scripts/ifup-tunnel | 5 | ||||
| -rw-r--r-- | network-scripts/network-functions | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/doc/sysconfig.txt b/doc/sysconfig.txt index 891a10eb..d6f6e719 100644 --- a/doc/sysconfig.txt +++ b/doc/sysconfig.txt @@ -882,7 +882,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|IPIP6|EXTERNAL + TYPE=GRE|GRE6|IPIP|IPIP6|EXTERNAL External is a mode for ip6_tunnel interfaces (that cannot be set on the primary ip6tnl0 interface), which permits unwrapping encapsulated packets regardless of their internal IP (v4 or v6) provided the inner diff --git a/network-scripts/ifup-tunnel b/network-scripts/ifup-tunnel index afdfe928..ea85df52 100755 --- a/network-scripts/ifup-tunnel +++ b/network-scripts/ifup-tunnel @@ -42,6 +42,11 @@ GRE) proto=-4 /sbin/modprobe ip_gre ;; +GRE6) + MODE=ip6gre + proto=-6 + /sbin/modprobe ip6_gre + ;; IPIP) MODE=ipip proto=-4 diff --git a/network-scripts/network-functions b/network-scripts/network-functions index a2382e33..614ad490 100644 --- a/network-scripts/network-functions +++ b/network-scripts/network-functions @@ -146,7 +146,7 @@ source_config () CTC) DEVICETYPE="ctc" ;; - GRE | IPIP | IPIP6) + GRE | GRE6 | IPIP | IPIP6) DEVICETYPE="tunnel" ;; SIT | sit) |