From de776701e874eb26ada19d84647cdae8f755caab Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Mon, 21 Dec 2020 09:53:37 +0100 Subject: [PATCH] Set uhttpd config only at first boot and update fstab at update --- .../files/etc/uci-defaults/2050-omr-uhttpd | 14 ++++++++------ .../files/etc/uci-defaults/2060-omr-system | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd b/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd index 9c5e28002..a2076f640 100755 --- a/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd +++ b/openmptcprouter/files/etc/uci-defaults/2050-omr-uhttpd @@ -1,8 +1,10 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - set uhttpd.main.redirect_https=0 - set uhttpd.main.script_timeout=240 - set uhttpd.main.network_timeout=240 - set uhttpd.main.http_keepalive=0 -EOF +if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set uhttpd.main.redirect_https=0 + set uhttpd.main.script_timeout=240 + set uhttpd.main.network_timeout=240 + set uhttpd.main.http_keepalive=0 + EOF +fi exit 0 \ No newline at end of file diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system index 3b578e3fc..0acd9fd6f 100755 --- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system +++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system @@ -12,6 +12,8 @@ uci -q batch <<-EOF >/dev/null commit fstab EOF +/sbin/block detect > /etc/config/fstab + [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && { # force CPU speed for RPI uci -q set openmptcprouter.settings.scaling_min_freq=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq | tr -d "\n")