diff options
| author | Jan Macku <jamacku@redhat.com> | 2019-08-19 12:34:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 12:34:23 +0200 |
| commit | 533cd7289d500bfdc50d9b71544d888662b0cb92 (patch) | |
| tree | ccbf94b5646ca605575bbffb19e11b7bac6320a9 | |
| parent | e266147fb4177e81830505de19013c3efd67badc (diff) | |
| download | initscripts-533cd7289d500bfdc50d9b71544d888662b0cb92.tar initscripts-533cd7289d500bfdc50d9b71544d888662b0cb92.tar.gz initscripts-533cd7289d500bfdc50d9b71544d888662b0cb92.tar.bz2 initscripts-533cd7289d500bfdc50d9b71544d888662b0cb92.tar.xz initscripts-533cd7289d500bfdc50d9b71544d888662b0cb92.zip | |
Add option for IPv6 GRE tunnel.
Resolve: BZ #1691552
| -rw-r--r-- | sysconfig.txt | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-tunnel | 5 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index aec8b81b..cee55eba 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -931,7 +931,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 + TYPE=GRE|GRE6|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 a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel index 5a1df54c..0328eed6 100755 --- a/sysconfig/network-scripts/ifup-tunnel +++ b/sysconfig/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/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 4045af91..63f4672c 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -146,7 +146,7 @@ source_config () CTC) DEVICETYPE="ctc" ;; - GRE | IPIP | IPIP6) + GRE | GRE6 | IPIP | IPIP6) DEVICETYPE="tunnel" ;; SIT | sit) |