diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index 0e8c425..3397a79 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -25,12 +25,9 @@ cat ${pwd}/feeds.conf >> feeds.conf ./scripts/feeds install -a make defconfig -echo 'CONFIG_PACKAGE_python3-packages=y' >> .config -echo 'CONFIG_PACKAGE_python3-packages-list="CherryPy==18.8.0"' >> .config # Enable collectd network encryption echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config -make package/python3-packages/compile make package/asterisk-chan-quectel/compile make package/collectd/compile # no signing key diff --git a/defaults/49-network b/defaults/49-network index 357ae22..494c737 100644 --- a/defaults/49-network +++ b/defaults/49-network @@ -1,7 +1,9 @@ -[ "$(uci -q get luci.diag.dns)" = "bitmessage.org" ] && exit 0 +VERSION=1 -# make a significant change -/sbin/uci set luci.diag.dns='bitmessage.org' +[ "$(uci -q get defaults.version.network)" -ge "$VERSION" ] & exit + +# save version +/sbin/uci set defaults.version.network="$VERSION" # switch LAN to eth1 /sbin/uci set network.@device[0].ports='eth1' diff --git a/defaults/50-dropbear b/defaults/50-dropbear index 8468817..c97a1eb 100644 --- a/defaults/50-dropbear +++ b/defaults/50-dropbear @@ -1,6 +1,12 @@ VERSION=1 -[ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ] && exit 0 +if [ "$(uci -q get defaults.version.dropbear)" -ge "$VERSION" ] +then + # may leave dropbear off after an upgrade + /sbin/service dropbear enable + /sbin/service dropbear restart + exit 0 +fi # save version /sbin/uci set defaults.version.dropbear="$VERSION"