summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-05-08 23:37:25 +0200
committerDaniil Baturin <daniil@baturin.org>2014-05-08 23:37:25 +0200
commitda02976adb4089e64687256744cb32c818a37c03 (patch)
treec03ed772fb8cd275592af75758fade440b07c8ba
parent23cc6d471b41f2706c1d8124ee6e6b32195b546c (diff)
downloadvyatta-conntrack-da02976adb4089e64687256744cb32c818a37c03.tar.gz
vyatta-conntrack-da02976adb4089e64687256744cb32c818a37c03.zip
Bug #185: ensure nf_conntrack_netlink is loaded and unloaded properly.
Patch by Kim Hagen.
-rw-r--r--scripts/vyatta-update-conntrack-log.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/vyatta-update-conntrack-log.pl b/scripts/vyatta-update-conntrack-log.pl
index 0548762..92e720b 100644
--- a/scripts/vyatta-update-conntrack-log.pl
+++ b/scripts/vyatta-update-conntrack-log.pl
@@ -31,6 +31,7 @@ if ($config->isEmpty()) {
Vyatta::Conntrack::Config::kill_daemon();
# delete the .lock and .log file getting generated
`rm -f $pfile`;
+ `rmmod nf_conntrack_netlink`;
exit 0;
}
@@ -39,9 +40,11 @@ if (defined ($cmd)) {
# First stop the daemon and restart with config
Vyatta::Conntrack::Config::kill_daemon();
`rm -f $pfile`;
+ `modprobe nf_conntrack_netlink`;
system("$cmd");
if ($? >> 8) {
print STDERR "Failed to start conntrack logging daemon";
+ `rmmod nf_conntrack_netlink`;
exit 1;
}
}