From 25b32ec2fef4bc6e63aaf93edecd7a102760c482 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 13 Apr 2018 12:45:18 +0200
Subject: [PATCH] treewide: move sysctl settings to /etc/sysctl.d
net.ipv6.conf.br-client.forwarding is moved from gluon-client-bridge to
gluon-mesh-batman-adv, as the setting is not useful with non-bridged
protocols.
---
.../luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network | 4 ----
package/gluon-core/files/etc/sysctl.d/30-gluon-core.conf | 1 +
package/gluon-core/luasrc/lib/gluon/upgrade/110-network | 5 -----
.../gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom | 5 -----
.../files/etc/sysctl.d/31-gluon-mesh-batman-adv.conf | 2 ++
.../gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge | 4 ----
6 files changed, 3 insertions(+), 18 deletions(-)
create mode 100644 package/gluon-core/files/etc/sysctl.d/30-gluon-core.conf
delete mode 100755 package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
create mode 100644 package/gluon-mesh-batman-adv/files/etc/sysctl.d/31-gluon-mesh-batman-adv.conf
diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
index 5ed4524f5..c79bc3c77 100755
--- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
+++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
@@ -1,7 +1,6 @@
#!/usr/bin/lua
local sysconfig = require 'gluon.sysconfig'
-local sysctl = require 'gluon.sysctl'
local util = require 'gluon.util'
local uci = require('simple-uci').cursor()
@@ -72,6 +71,3 @@ uci:section('dhcp', 'dhcp', 'local_client', {
uci:save('dhcp')
uci:save('firewall')
-
-
-sysctl.set('net.ipv6.conf.br-client.forwarding', 0)
diff --git a/package/gluon-core/files/etc/sysctl.d/30-gluon-core.conf b/package/gluon-core/files/etc/sysctl.d/30-gluon-core.conf
new file mode 100644
index 000000000..12d569a0f
--- /dev/null
+++ b/package/gluon-core/files/etc/sysctl.d/30-gluon-core.conf
@@ -0,0 +1 @@
+vm.panic_on_oom=1
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/110-network b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
index 761975173..79c50d279 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/110-network
@@ -1,7 +1,6 @@
#!/usr/bin/lua
local uci = require('simple-uci').cursor()
-local sysctl = require 'gluon.sysctl'
local sysconfig = require 'gluon.sysconfig'
@@ -68,7 +67,3 @@ uci:section('firewall', 'rule', 'wan_mld', {
})
uci:save('firewall')
-
-
-sysctl.set('net.ipv6.conf.all.accept_ra', 0)
-sysctl.set('net.ipv6.conf.default.accept_ra', 0)
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom b/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
deleted file mode 100755
index 48cfc5a8f..000000000
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/130-reboot-on-oom
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/lua
-
-local sysctl = require 'gluon.sysctl'
-
-sysctl.set('vm.panic_on_oom', 1)
diff --git a/package/gluon-mesh-batman-adv/files/etc/sysctl.d/31-gluon-mesh-batman-adv.conf b/package/gluon-mesh-batman-adv/files/etc/sysctl.d/31-gluon-mesh-batman-adv.conf
new file mode 100644
index 000000000..c93fa0da6
--- /dev/null
+++ b/package/gluon-mesh-batman-adv/files/etc/sysctl.d/31-gluon-mesh-batman-adv.conf
@@ -0,0 +1,2 @@
+net.ipv6.conf.br-client.forwarding=0
+net.ipv6.conf.local-node.forwarding=0
diff --git a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
index 231fe961b..a03ea6585 100755
--- a/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
+++ b/package/gluon-mesh-batman-adv/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-client-bridge
@@ -6,7 +6,6 @@
local site = require 'gluon.site'
local sysconfig = require 'gluon.sysconfig'
-local sysctl = require 'gluon.sysctl'
local util = require 'gluon.util'
local uci = require('simple-uci').cursor()
@@ -51,6 +50,3 @@ uci:set_list('firewall', 'drop', 'network', networks)
uci:delete('firewall', 'local_node_dns')
uci:save('firewall')
-
-
-sysctl.set('net.ipv6.conf.local-node.forwarding', 0)
--
GitLab