summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-01-25 14:56:28 +0000
committerColin Guthrie <colin@mageia.org>2014-01-25 14:56:28 +0000
commit12c946b22963a7b5e7607d2e93c6ae0857f66795 (patch)
tree3e2ea2908be280c38863dc690c07f165aac15a2b
parentf40d4ecae66a6166ef858770d3863729c78dfb64 (diff)
downloaddrakx-net-12c946b22963a7b5e7607d2e93c6ae0857f66795.tar
drakx-net-12c946b22963a7b5e7607d2e93c6ae0857f66795.tar.gz
drakx-net-12c946b22963a7b5e7607d2e93c6ae0857f66795.tar.bz2
drakx-net-12c946b22963a7b5e7607d2e93c6ae0857f66795.tar.xz
drakx-net-12c946b22963a7b5e7607d2e93c6ae0857f66795.zip
shorewall: correct path to shorewall config mga#11928
-rw-r--r--NEWS1
-rw-r--r--lib/network/shorewall.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 41d969d..a1800d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- correct path to shorewall config
- do not exec pkexec but run it so it has a parent process to fix double fork
issues mga#11184 mga#12364
diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index 0ae7b9e..4532412 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -51,7 +51,7 @@ sub set_in_file {
$_ .= $last_line if $last_line;
$done = 1;
}
- } "$::prefix/etc/shorewall/$file";
+ } "$::prefix${shorewall_root}/$file";
}
sub dev_to_shorewall {