From 1275813e1faf071572fc487b913917e395e5157e Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Sat, 1 Apr 2023 12:53:31 +0200 Subject: [PATCH 1/3] exlude eth interfaces --- .../files/lib/gluon/eulenfunk-hotfix/IfNoWificlient.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/IfNoWificlient.sh b/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/IfNoWificlient.sh index 2b64dfd..eaa0f7b 100755 --- a/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/IfNoWificlient.sh +++ b/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/IfNoWificlient.sh @@ -3,7 +3,7 @@ upgrade_started='/tmp/autoupdate.lock' [ -f $upgrade_started ] && exit -cliifs=$(/usr/sbin/brctl show | sed -n -e '/^br-client[[:space:]]/,/^\S/ { /^\(br-client[[:space:]]\|\t\)/s/^.*\t//p }' | grep -v "bat0" | grep -v "local-port"| tr '\n' ' ') +cliifs=$(/usr/sbin/brctl show | sed -n -e '/^br-client[[:space:]]/,/^\S/ { /^\(br-client[[:space:]]\|\t\)/s/^.*\t//p }' | grep -v "bat0\|eth\|local-port"| tr '\n' ' ') APoff=1 for r in 0 1 2; do From 163701eb6faef5e0ad6ece1977b037e7b8c55a0e Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Sat, 1 Apr 2023 13:00:55 +0200 Subject: [PATCH 2/3] only process file once --- eulenfunk-hotfix/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/eulenfunk-hotfix/Makefile b/eulenfunk-hotfix/Makefile index 39f2a62..5357300 100644 --- a/eulenfunk-hotfix/Makefile +++ b/eulenfunk-hotfix/Makefile @@ -27,7 +27,6 @@ endef define Package/$(PKG_NAME)/install $(CP) ./files/* $(1)/ ./gluonShellDiet.sh $(1)/lib/gluon/eulenfunk-hotfix/rebootIfNoGw.sh - ./gluonShellDiet.sh $(1)/lib/gluon/eulenfunk-hotfix/rebootIfNoGw.sh ./gluonShellDiet.sh $(1)/lib/gluon/eulenfunk-hotfix/healthcheck.sh ./gluonShellDiet.sh $(1)/lib/gluon/eulenfunk-hotfix/check_hostapd.sh endef From 1fb39648239dda47f2f7bbb24b5c683e5078dff7 Mon Sep 17 00:00:00 2001 From: Florian Maurer Date: Sat, 1 Apr 2023 13:03:12 +0200 Subject: [PATCH 3/3] Log Pfad angepasst Pfad zeigte noch auf den alten Speicherort des Skriptes. Der neue Pfad existierte nicht, somit wurde keine Logs erzeugt. --- .../files/lib/gluon/eulenfunk-hotfix/healthcheck.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/healthcheck.sh b/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/healthcheck.sh index 3151d0d..e9fc3cb 100755 --- a/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/healthcheck.sh +++ b/eulenfunk-hotfix/files/lib/gluon/eulenfunk-hotfix/healthcheck.sh @@ -14,7 +14,7 @@ now_reboot() { # second optional -f to force reboot even if autoupdater is running logger -s -t "eulenfunk-healthcheck" -p 5 "rebooting... reason: $1" if [ "$(sed 's/\..*//g' /proc/uptime)" -gt "3600" ] ; then - LOG=/lib/gluon/healthcheck/reboot.log + LOG=/lib/gluon/eulenfunk-hotfix/reboot.log # the first 5 times log the reason for a reboot in a file that is rebootsave [ "$(wc -l < $LOG)" -gt 5 ] || echo "$(date) $1" >> $LOG if [ "$2" != "-f" ] && [ -f /tmp/autoupdate.lock ] ; then