From patchwork Wed Apr 22 14:32:46 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: treewide: add "exit 0" for uci-defaults files
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 1358
Message-Id: <20200422143246.3467-1-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Cc: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 22 Apr 2020 16:32:46 +0200

uci-defaults scripts are supposed to be run once after firstboot
and then removed. However, the removal only takes place if the
subshell created for the sourced scripts returns exit code 0.

For some of the files, the last command returned a different exit
code, though, leading to the script remaining in its location and
being executed for every boot.

To prevent cases like the latter, this adds an "exit 0" to all
uci-defaults files in our package store. While at it, remove the
shebang for all these files since they are sourced (and not
executed).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
 .../files/etc/uci-defaults/52-alfred-master                   | 3 +--
 .../fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred       | 4 ++--
 src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute | 4 ++--
 .../fff/fff-babeld/files/etc/uci-defaults/02-network-rules    | 4 +---
 .../fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv   | 2 --
 .../fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname | 4 ++--
 .../files/etc/uci-defaults/05-config-system-migration         | 4 ++--
 .../fff/fff-config/files/etc/uci-defaults/98-configure-fff    | 3 ++-
 src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp  | 2 --
 .../fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd         | 4 ++--
 .../fff/fff-macnock/files/etc/uci-defaults/52-fff-macnock     | 4 ++--
 src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra      | 2 --
 .../fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc  | 4 ++--
 .../fff/fff-support/files/etc/uci-defaults/80-banner-info     | 3 ++-
 .../fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade   | 3 ++-
 .../fff-timeserver/files/etc/uci-defaults/51-fff-timeserver   | 4 ++--
 src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd | 3 +--
 .../fff-wireguard/files/etc/uci-defaults/05-wireguard-rules   | 2 --
 .../fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless  | 3 ++-
 .../fff-wireless/files/etc/uci-defaults/24b-config-wireless   | 3 ++-
 20 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
index bf76a162..87ec1f8c 100755
--- a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
@@ -1,6 +1,5 @@
-#!/bin/sh
-
 uci -q set "alfred.alfred.mode=master"
 
 uci -q commit alfred
 
+exit 0
diff --git a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
index 3df67643..13db5062 100644
--- a/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
+++ b/src/packages/fff/fff-alfred/files/etc/uci-defaults/51-fff-alfred
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 >/etc/config/alfred
 
 uci batch <<EOF
@@ -10,3 +8,5 @@ uci batch <<EOF
   set alfred.alfred.start_vis='0'
   set alfred.alfred.run_facters='0'
 EOF
+
+exit 0
diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute b/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute
index 93d0574a..b42b62a4 100644
--- a/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute
+++ b/src/packages/fff/fff-babeld/files/etc/uci-defaults/01-iproute
@@ -1,3 +1,3 @@
-#!/bin/sh
-
 echo "10 fff" >> /etc/iproute2/rt_tables
+
+exit 0
diff --git a/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules b/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules
index 82516d59..df78e16e 100644
--- a/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules
+++ b/src/packages/fff/fff-babeld/files/etc/uci-defaults/02-network-rules
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 uci batch <<EOF
   add network rule
   set network.@rule[0].src='10.50.0.0/16'
@@ -41,6 +39,6 @@ uci batch <<EOF
   set network.@rule6[2].priority='31'
 EOF
 
-uci commit
+uci commit network
 
 exit 0
diff --git a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
index a3d1192e..ef249b5d 100644
--- a/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
+++ b/src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 uci batch <<EOF
   set network.bat0=interface
   set network.bat0.proto=batadv
diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
index a96c05a8..43a816e4 100644
--- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
+++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 BOARD=$(cat /var/sysinfo/board_name)
 
 case "$BOARD" in
@@ -73,3 +71,5 @@ esac
 
 uci set board.model.name=$BOARD
 uci commit board
+
+exit 0
diff --git a/src/packages/fff/fff-config/files/etc/uci-defaults/05-config-system-migration b/src/packages/fff/fff-config/files/etc/uci-defaults/05-config-system-migration
index fe4ad978..5e11b4b9 100644
--- a/src/packages/fff/fff-config/files/etc/uci-defaults/05-config-system-migration
+++ b/src/packages/fff/fff-config/files/etc/uci-defaults/05-config-system-migration
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 if [ ! -s /etc/config/fff ] ; then
 
 	UPGRADE_hostname=$(uci -q get "system.@system[0].hostname")
@@ -25,3 +23,5 @@ if [ ! -s /etc/config/fff ] ; then
 
 	uci -q commit fff
 fi
+
+exit 0
diff --git a/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff b/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff
index 632129ba..88a4319f 100644
--- a/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff
+++ b/src/packages/fff/fff-config/files/etc/uci-defaults/98-configure-fff
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2017 Adrian Schmutzler
 # License GPLv3
 
@@ -20,3 +19,5 @@ poe_passthrough=$(uci -q get "fff.poe_passthrough.active")
 if [ "$poe_passthrough" = "1" ] && [ -s /usr/lib/fff-support/activate_poe_passthrough.sh ] ; then
 	/usr/lib/fff-support/activate_poe_passthrough.sh
 fi
+
+exit 0
diff --git a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
index 3d82bb6d..e5e74613 100644
--- a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
+++ b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 uci batch <<EOF
   delete dhcp.@dnsmasq[0]
   delete dhcp.lan
diff --git a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
index 08ceecb6..dc2e3459 100644
--- a/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
+++ b/src/packages/fff/fff-fastd/files/etc/uci-defaults/55_fff-fastd
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 /etc/init.d/fastd disable
 
 >/etc/config/fastd
@@ -32,3 +30,5 @@ echo "#!/bin/sh" > /etc/fastd/fff/up.sh
 echo "ip link set up dev fffVPN" >> /etc/fastd/fff/up.sh
 echo "batctl if add fffVPN" >> /etc/fastd/fff/up.sh
 chmod +x /etc/fastd/fff/up.sh
+
+exit 0
diff --git a/src/packages/fff/fff-macnock/files/etc/uci-defaults/52-fff-macnock b/src/packages/fff/fff-macnock/files/etc/uci-defaults/52-fff-macnock
index 5c0b7881..3c5c5013 100644
--- a/src/packages/fff/fff-macnock/files/etc/uci-defaults/52-fff-macnock
+++ b/src/packages/fff/fff-macnock/files/etc/uci-defaults/52-fff-macnock
@@ -1,6 +1,6 @@
-#!/bin/sh
-
 if ! grep -q u32 /etc/iproute2/ematch_map;
 then
     echo "3 u32" > /etc/iproute2/ematch_map
 fi
+
+exit 0
diff --git a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
index 0a1c446e..7cf1a3ba 100644
--- a/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
+++ b/src/packages/fff/fff-ra/files/etc/uci-defaults/90-fff-ra
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 uci batch <<EOF
 	set dhcp.mesh=dhcp
 	set dhcp.mesh.interface='mesh'
diff --git a/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc b/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc
index b6389cac..23f90e21 100644
--- a/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc
+++ b/src/packages/fff/fff-simple-tc/files/etc/uci-defaults/98-configure-tc
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 traffic_enabled=$(uci -q get "fff.trafficcontrol.enabled")
 traffic_in=$(uci -q get "fff.trafficcontrol.limit_in")
 traffic_out=$(uci -q get "fff.trafficcontrol.limit_out")
@@ -10,3 +8,5 @@ uci set "simple-tc.example.limit_ingress=${traffic_in}"
 uci set "simple-tc.example.limit_egress=${traffic_out}"
 
 uci commit simple-tc
+
+exit 0
diff --git a/src/packages/fff/fff-support/files/etc/uci-defaults/80-banner-info b/src/packages/fff/fff-support/files/etc/uci-defaults/80-banner-info
index 5ffef084..75328dd2 100644
--- a/src/packages/fff/fff-support/files/etc/uci-defaults/80-banner-info
+++ b/src/packages/fff/fff-support/files/etc/uci-defaults/80-banner-info
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2018 Adrian Schmutzler
 # License GPLv3
 
@@ -7,3 +6,5 @@
 echo "" >> /etc/banner
 echo "> $(cat /tmp/sysinfo/model 2>/dev/null) @ $FIRMWARE_VERSION" >> /etc/banner
 echo "" >> /etc/banner
+
+exit 0
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
index 822e2651..80c87e47 100644
--- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
+++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2017 Tim Niemeyer
 # License GPLv3
 
@@ -12,3 +11,5 @@ cat > /etc/sysupgrade.conf <<-__EOF__
 /etc/config/gateway
 /etc/hoodfile
 __EOF__
+
+exit 0
diff --git a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver
index fe5979dd..88645586 100644
--- a/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver
+++ b/src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 . /lib/functions/fff/timeserver
 
 # No initialization here, this is done in configurehood
@@ -7,3 +5,5 @@
 uci -q set "system.@system[0].timezone=CET-1CEST,M3.5.0,M10.5.0/3"
 
 uci -q commit system
+
+exit 0
diff --git a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
index 248a78bb..f3135370 100644
--- a/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
+++ b/src/packages/fff/fff-web/files/etc/uci-defaults/93-fff-uhttpd
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 . /lib/functions/fff/keyxchange
 
 ln -s "$hoodfilewww" /www/hood/keyxchangev2data
@@ -46,4 +44,5 @@ uci batch <<EOF
 EOF
 
 uci commit uhttpd
+
 exit 0
diff --git a/src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules b/src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules
index 4ffce098..19bf0d58 100644
--- a/src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules
+++ b/src/packages/fff/fff-wireguard/files/etc/uci-defaults/05-wireguard-rules
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 uci batch <<EOF
 	set network.wireguard_main=rule6
 	set network.wireguard_main.mark='0xc8'
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
index 57e71927..218ec486 100644
--- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
+++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24a-fff-wireless
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2016 Tim Niemeyer
 # Copyright 2019 Adrian Schmutzler
 # License GPLv3
@@ -81,4 +80,6 @@ config_foreach configWifiDevice wifi-device
 uci commit network
 uci commit wireless
 
+exit 0
+
 # vim: set noexpandtab:tabstop=4
diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
index f0257fb7..6198d14c 100644
--- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
+++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2018 Adrian Schmutzler
 # License GPLv3
 
@@ -39,3 +38,5 @@ esac
 
 # rssileds: always disable if package is installed
 [ -x "/etc/init.d/rssileds" ] && /etc/init.d/rssileds disable
+
+exit 0