clean up old cleanup code lines (#2119)
* gluon-core: remove obsolete file 100-core-reset-sysctl * gluon-core: remove obsolete cleanup line * gluon-client-bridge: remove obsolete cleanup line
This commit is contained in:
parent
5b068d7c47
commit
ab2f82ca73
@ -40,9 +40,6 @@ uci:section('network', 'interface', 'client', {
|
|||||||
|
|
||||||
uci:save('network')
|
uci:save('network')
|
||||||
|
|
||||||
-- TODO: remove this line and the next in 2019. Firewall zones have been renamed in 2017.
|
|
||||||
uci:delete('firewall', 'client')
|
|
||||||
|
|
||||||
uci:section('firewall', 'zone', 'drop', {
|
uci:section('firewall', 'zone', 'drop', {
|
||||||
name = 'drop',
|
name = 'drop',
|
||||||
network = {'client'},
|
network = {'client'},
|
||||||
@ -61,10 +58,6 @@ uci:set('dhcp', dnsmasq, 'boguspriv', false)
|
|||||||
uci:set('dhcp', dnsmasq, 'localise_queries', false)
|
uci:set('dhcp', dnsmasq, 'localise_queries', false)
|
||||||
uci:set('dhcp', dnsmasq, 'rebind_protection', false)
|
uci:set('dhcp', dnsmasq, 'rebind_protection', false)
|
||||||
|
|
||||||
-- TODO: remove this line and the next two in 2019 the zones were removed in 2017
|
|
||||||
uci:delete('dhcp', 'client')
|
|
||||||
uci:delete('firewall', 'local_node')
|
|
||||||
|
|
||||||
uci:section('dhcp', 'dhcp', 'local_client', {
|
uci:section('dhcp', 'dhcp', 'local_client', {
|
||||||
interface = 'client',
|
interface = 'client',
|
||||||
ignore = true,
|
ignore = true,
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# This script can be removed after Gluon v2018.2
|
|
||||||
|
|
||||||
# Check for a random line that always was in /etc/sysctl.conf
|
|
||||||
if grep -qxF 'net.ipv4.ip_forward=1' /etc/sysctl.conf; then
|
|
||||||
echo '# Defaults are configured in /etc/sysctl.d/* and can be customized in this file' >/etc/sysctl.conf
|
|
||||||
fi
|
|
@ -52,9 +52,6 @@ for _, zone in ipairs({'mesh', 'loc_client', 'wired_mesh'}) do
|
|||||||
family = 'ipv6',
|
family = 'ipv6',
|
||||||
target = 'ACCEPT',
|
target = 'ACCEPT',
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Can be removed soon: was never in a release
|
|
||||||
uci:delete('firewall', zone .. '_ICMPv6_out')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- ToDo Remove in v2022.x
|
-- ToDo Remove in v2022.x
|
||||||
|
Loading…
Reference in New Issue
Block a user