mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Merge branch 'develop' into master
This commit is contained in:
commit
33edda1868
2 changed files with 11 additions and 4 deletions
|
@ -2,7 +2,7 @@
|
||||||
# Copyright (C) 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
# Copyright (C) 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
|
||||||
# Released under GPL 3. See LICENSE for the full terms.
|
# Released under GPL 3. See LICENSE for the full terms.
|
||||||
|
|
||||||
START=9
|
START=1
|
||||||
STOP=98
|
STOP=98
|
||||||
|
|
||||||
boot() {
|
boot() {
|
||||||
|
@ -24,15 +24,15 @@ boot() {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
if [ "$(uci -q get openmptcprouter.settings.version)" != "${OMRVERSION}" ]; then
|
if [ "$(uci -q get openmptcprouter.settings.version)" != "${OMRVERSION}" ]; then
|
||||||
|
uci -q set openmptcprouter.settings=settings
|
||||||
|
uci -q set openmptcprouter.settings.version=${OMRVERSION}
|
||||||
|
uci commit
|
||||||
cd /rom/etc/uci-defaults || cd /usr/share/omr-update || return 0
|
cd /rom/etc/uci-defaults || cd /usr/share/omr-update || return 0
|
||||||
files="$(ls)"
|
files="$(ls)"
|
||||||
[ -z "$files" ] && return 0
|
[ -z "$files" ] && return 0
|
||||||
for file in $files; do
|
for file in $files; do
|
||||||
( . "./$(basename $file)" )
|
( . "./$(basename $file)" )
|
||||||
done
|
done
|
||||||
uci -q set openmptcprouter.settings=settings
|
|
||||||
uci -q set openmptcprouter.settings.version=${OMRVERSION}
|
|
||||||
uci commit
|
|
||||||
fi
|
fi
|
||||||
# temporary hack until configd exists
|
# temporary hack until configd exists
|
||||||
/sbin/reload_config
|
/sbin/reload_config
|
||||||
|
|
|
@ -12,6 +12,13 @@ uci -q batch <<-EOF >/dev/null
|
||||||
commit fstab
|
commit fstab
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
|
||||||
|
uci -q batch <<-EOF >/dev/null
|
||||||
|
set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
|
||||||
|
commit rpcd
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
/sbin/block detect > /etc/config/fstab
|
/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" ] && {
|
[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue