diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-02-11 08:53:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 08:53:12 +0100 |
| commit | 6648b03c41186fd9de6604ca096b46fb7aa53f09 (patch) | |
| tree | 1ba33aa0c2cb2ae2ad8f14abdce6e4c88472229b /templates-cfg/system/conntrack/modules/pptp/disable/node.def | |
| parent | e51142bdf998270c377e19bdbe237f4e1eb5a29b (diff) | |
| parent | 21bf2576345974b92689b78ee8b67444c9af3d44 (diff) | |
| download | vyatta-conntrack-6648b03c41186fd9de6604ca096b46fb7aa53f09.tar.gz vyatta-conntrack-6648b03c41186fd9de6604ca096b46fb7aa53f09.zip | |
Merge pull request #3 from bstepler/T3290
conntrack: T3290: remove references to removed GRE plugins
Diffstat (limited to 'templates-cfg/system/conntrack/modules/pptp/disable/node.def')
| -rw-r--r-- | templates-cfg/system/conntrack/modules/pptp/disable/node.def | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/templates-cfg/system/conntrack/modules/pptp/disable/node.def b/templates-cfg/system/conntrack/modules/pptp/disable/node.def index 4ffd980..8051889 100644 --- a/templates-cfg/system/conntrack/modules/pptp/disable/node.def +++ b/templates-cfg/system/conntrack/modules/pptp/disable/node.def @@ -1,20 +1,7 @@ help: Disable PPTP connection tracking -create: cli-shell-api exists system conntrack modules gre disable - if [ $? == 0 ]; then - # Do nothing, this case is handled in GRE module templates - :; - else - sudo rmmod nf_nat_pptp - sudo rmmod nf_conntrack_pptp - fi +create: sudo rmmod nf_nat_pptp + sudo rmmod nf_conntrack_pptp -# PPTP shouldn't be enabled when GRE is disabled because PPTP depends on it -delete: cli-shell-api exists system conntrack modules gre disable - if [ $? == 0 ]; then - echo "Error: can not enable PPTP connection tracking when GRE connection tracking is disabled!" - exit 1 - else - sudo modprobe nf_conntrack_pptp - sudo modprobe nf_nat_pptp - fi +delete: sudo modprobe nf_conntrack_pptp + sudo modprobe nf_nat_pptp |