diff options
| author | Jan Macku <jamacku@redhat.com> | 2019-07-11 12:14:19 +0200 |
|---|---|---|
| committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-07-31 14:06:45 +0200 |
| commit | c2012fb057ce96ce49191af5a8526753bbc6f701 (patch) | |
| tree | 96a5ae30ada9ee6899cf2c9992e304552591193e | |
| parent | d6af590090a2a8ffd45e273bdbd46a3fefc8debb (diff) | |
| download | initscripts-c2012fb057ce96ce49191af5a8526753bbc6f701.tar initscripts-c2012fb057ce96ce49191af5a8526753bbc6f701.tar.gz initscripts-c2012fb057ce96ce49191af5a8526753bbc6f701.tar.bz2 initscripts-c2012fb057ce96ce49191af5a8526753bbc6f701.tar.xz initscripts-c2012fb057ce96ce49191af5a8526753bbc6f701.zip | |
Add ip6gre tunnel option
Resolve: BZ #1691552
| -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 5878d38f..b16338a9 100644 --- a/doc/sysconfig.txt +++ b/doc/sysconfig.txt @@ -881,7 +881,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) |