summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-27 15:55:49 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-27 15:55:49 +0100
commit1a7ade5eb14bc88adf9a922153caacf31d45a92f (patch)
tree3709c3a0c83a569339cd79ad7b57369f11b6adbb
parent40db831018adff101d00860c63151fea57c715d9 (diff)
downloaddrakx-net-1a7ade5eb14bc88adf9a922153caacf31d45a92f.tar
drakx-net-1a7ade5eb14bc88adf9a922153caacf31d45a92f.tar.gz
drakx-net-1a7ade5eb14bc88adf9a922153caacf31d45a92f.tar.bz2
drakx-net-1a7ade5eb14bc88adf9a922153caacf31d45a92f.tar.xz
drakx-net-1a7ade5eb14bc88adf9a922153caacf31d45a92f.zip
adapt to new /etc/sysctl.d
-rw-r--r--NEWS1
-rw-r--r--lib/network/network.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index a608440..7f62638 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- adapt to new /etc/sysctl.d
- drakfirewall: add 6881:6999 UDP port range for Bittorrent
(this is used by rtorrent)
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 4030b76..e039821 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -468,7 +468,7 @@ sub netprofile_read {
sub advanced_settings_read() {
my $modprobe = "$::prefix/etc/modprobe.conf";
- my $sysctl = "$::prefix/etc/sysctl.conf";
+ my $sysctl = "$::prefix/etc/sysctl.d/51-drakx.conf";
my $msecconf = "$::prefix/etc/security/msec/security.conf";
my $ipv6_disabled = find { /^options ipv6 disable=1$/ } cat_($modprobe);
@@ -516,7 +516,7 @@ sub advanced_settings_write {
$_ .= "net.ipv4.icmp_echo_ignore_broadcasts=$disable_icmp_broadcasts\n";
$_ .= "net.ipv4.icmp_ignore_bogus_error_responses=$disable_bogus_error_responses\n";
}
- } "$::prefix/etc/sysctl.conf";
+ } "$::prefix/etc/sysctl.d/51-drakx.conf";
}
sub advanced_choose {