From patchwork Mon Feb 4 13:05:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: configurenetwork: Tidy-up auto configuration functions From: Adrian Schmutzler X-Patchwork-Id: 1021 Message-Id: <20190204130547.910-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Mon, 4 Feb 2019 14:05:47 +0100 This fixes a typo in description and introduces a single variable for the sysctlfile. Signed-off-by: Adrian Schmutzler Reviewed-by: Christian Dresel --- .../fff/fff-network/files/usr/sbin/configurenetwork | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index 0e038a49..448bd04b 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -30,19 +30,20 @@ setupPorts() { setAutoConf() { # Sets ipv6 auto configuration on an interface to on/off - # Usage: enableAutoConf <[0|1]> + # Usage: setAutoConf <[0|1]> local iface=$1 local on=$2 - echo "# Generated from configurenetwork" > "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.accept_ra = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.accept_ra_pinfo = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.autoconf = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.accept_ra_rtr_pref = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf" - echo "net.ipv6.conf.$iface.forwarding = 0" >> "/etc/sysctl.d/51-fff-network-$iface.conf" + sysctlfile="/etc/sysctl.d/51-fff-network-$iface.conf" + echo "# Generated from configurenetwork" > "$sysctlfile" + echo "net.ipv6.conf.$iface.accept_ra = $on" >> "$sysctlfile" + echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "$sysctlfile" + echo "net.ipv6.conf.$iface.accept_ra_pinfo = $on" >> "$sysctlfile" + echo "net.ipv6.conf.$iface.autoconf = $on" >> "$sysctlfile" + echo "net.ipv6.conf.$iface.accept_ra_rtr_pref = $on" >> "$sysctlfile" + echo "net.ipv6.conf.$iface.forwarding = 0" >> "$sysctlfile" - /sbin/sysctl -p "/etc/sysctl.d/51-fff-network-$iface.conf" + /sbin/sysctl -p "$sysctlfile" } enableAutoConf() {