From 7b3a05217c9a029833288d0617ddc6226f84aff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20=C5=A0urda?= <peter@bitmessage.at>
Date: Wed, 1 Mar 2023 08:15:29 +0100
Subject: [PATCH] Refactor and cleanup defaults

- 49-network is now using versioning
- 50-dropbear will make sure dropbear runs even if no version bump
  happened
---
 defaults/49-network  | 8 +++++---
 defaults/50-dropbear | 8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

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"