From d6c486408662a597300c7498f9e7efb197edce10 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 22 Dec 2020 14:12:01 +0100
Subject: [PATCH 1/2] Fix omr-update

---
 omr-update/files/etc/init.d/omr-update | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/omr-update/files/etc/init.d/omr-update b/omr-update/files/etc/init.d/omr-update
index 0199bb214..6f79dae88 100755
--- a/omr-update/files/etc/init.d/omr-update
+++ b/omr-update/files/etc/init.d/omr-update
@@ -2,7 +2,7 @@
 # Copyright (C) 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 # Released under GPL 3. See LICENSE for the full terms.
 
-START=9
+START=1
 STOP=98
 
 boot() {
@@ -24,15 +24,15 @@ boot() {
 		return 0
 	}
 	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
 		files="$(ls)"
 		[ -z "$files" ] && return 0
 		for file in $files; do
 			( . "./$(basename $file)" )
 		done
-		uci -q set openmptcprouter.settings=settings
-		uci -q set openmptcprouter.settings.version=${OMRVERSION}
-		uci commit
 	fi
 	# temporary hack until configd exists
 	/sbin/reload_config

From c0b5bb46524b277d6d8010296a67e7a223abc762 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 22 Dec 2020 14:15:34 +0100
Subject: [PATCH 2/2] Fix socket path

---
 openmptcprouter/files/etc/uci-defaults/2060-omr-system | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
index 0acd9fd6f..70beaade9 100755
--- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system
+++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
@@ -12,6 +12,13 @@ uci -q batch <<-EOF >/dev/null
 	commit fstab
 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
 
 [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && {