From ad00f08f0a2caeda317fa15fef43ae677681c1f5 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 31 Oct 2011 23:03:11 +0700 Subject: Terrible workaround for depencency between PPTP and GRE modules. --- templates/system/conntrack/modules/pptp/disable/node.def | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'templates/system/conntrack/modules/pptp/disable/node.def') diff --git a/templates/system/conntrack/modules/pptp/disable/node.def b/templates/system/conntrack/modules/pptp/disable/node.def index 00a2071e..4ffd980c 100644 --- a/templates/system/conntrack/modules/pptp/disable/node.def +++ b/templates/system/conntrack/modules/pptp/disable/node.def @@ -1,7 +1,13 @@ help: Disable PPTP connection tracking -create: sudo rmmod nf_nat_pptp - sudo rmmod nf_conntrack_pptp +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 # PPTP shouldn't be enabled when GRE is disabled because PPTP depends on it delete: cli-shell-api exists system conntrack modules gre disable @@ -11,4 +17,4 @@ delete: cli-shell-api exists system conntrack modules gre disable else sudo modprobe nf_conntrack_pptp sudo modprobe nf_nat_pptp - fi \ No newline at end of file + fi -- cgit v1.2.3