From 3709f58ec43c1b735cb756e8d5fa3e1213d9f385 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 9 Nov 2019 21:23:40 +0100
Subject: [PATCH] - skel-root/coolstream: unify stb-update scrits

---
 skel-root/hd1/etc/init.d/stb_update.data |  2 ++
 skel-root/hd1/etc/init.d/stb_update.sh   | 43 ++++++++++++++++++------
 skel-root/hd2/etc/init.d/stb_update.sh   |  8 ++---
 3 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 skel-root/hd1/etc/init.d/stb_update.data

diff --git a/skel-root/hd1/etc/init.d/stb_update.data b/skel-root/hd1/etc/init.d/stb_update.data
new file mode 100644
index 00000000..89ad08d2
--- /dev/null
+++ b/skel-root/hd1/etc/init.d/stb_update.data
@@ -0,0 +1,2 @@
+# get this info with "make get-update-info"
+V_KERNEL="Sat Jun 24 19:32:15 CEST 2017"
diff --git a/skel-root/hd1/etc/init.d/stb_update.sh b/skel-root/hd1/etc/init.d/stb_update.sh
index 24a22ab5..79b774c3 100755
--- a/skel-root/hd1/etc/init.d/stb_update.sh
+++ b/skel-root/hd1/etc/init.d/stb_update.sh
@@ -2,16 +2,37 @@
 
 . /etc/init.d/globals
 
-grep "Sat Jun 24 19:32:15 CEST 2017" /proc/version > /dev/null
-if [ $? == 1 ]; then
+DO_REBOOT=0
+
+if [ -e /etc/init.d/stb_update.data ]; then
+	. /etc/init.d/stb_update.data 2> /dev/null
+fi
+
+if [ -e /var/etc/.stb_update ]; then
+	rm /var/etc/.stb_update
+	# force an update with a bogus date
+	V_KERNEL="Sun Jan 1 00:00:00 CET 2042"
+fi
+
+if [ -f /var/update/zImage ]; then
 	DEV=`grep -i kernel /proc/mtd | cut -f 0 -s -d :`
-	test -e /dev/display && dt -t"Kernel Update. Please wait..."
-	SHOWINFO "Updating kernel on device $DEV ..."
-	flash_erase /dev/$DEV 0 0 && cat /var/update/zImage > /dev/$DEV
-	test -e /dev/display && dt -t"Update OK. reboot!"
-	SHOWINFO "Kernel update on device $DEV successful. reboot!"
-	rm -f /var/update/zImage && rm -f /etc/init.d/stb_update.sh && reboot -f
-else
-	SHOWINFO "Kernel already up-to-date"
-	rm -f /var/update/zImage && rm -f /etc/init.d/stb_update.sh
+	grep -q "$V_KERNEL" /proc/version
+	if [ $? == 1 ]; then
+		test -e /dev/display && dt -t"Kernel Update. Please wait..."
+		SHOWINFO "Updating kernel on device $DEV ..."
+		flash_erase /dev/$DEV 0 0 && cat /var/update/zImage > /dev/$DEV
+		test -e /dev/display && dt -t"Update OK. Reboot!"
+		SHOWINFO "Kernel update on device $DEV successful. reboot!"
+		DO_REBOOT=1
+	else
+		SHOWINFO "Kernel already up-to-date"
+	fi
+	rm -f /var/update/zImage
+fi
+
+if [ $DO_REBOOT == 1 ]; then
+	SHOWINFO "Reboot ..."
+	sync
+	sleep 2
+	reboot -f
 fi
diff --git a/skel-root/hd2/etc/init.d/stb_update.sh b/skel-root/hd2/etc/init.d/stb_update.sh
index 9ba7bb2d..204494ad 100755
--- a/skel-root/hd2/etc/init.d/stb_update.sh
+++ b/skel-root/hd2/etc/init.d/stb_update.sh
@@ -10,10 +10,10 @@ fi
 
 if [ -e /var/etc/.stb_update ]; then
 	rm /var/etc/.stb_update
-	#force an update with a bogus date
-	V_KERNEL="Jan 01 00:00:00 MSK 2042"
-	V_UBOOT="Jan 01 2042  - 00:00:00"
-	V_ULDR="Jan 01 2042 00:00:00"
+	# force an update with a bogus date
+	V_KERNEL="Sun Jan 1 00:00:00 CET 2042"
+	V_UBOOT="Sun Jan 01 2042  - 00:00:00"
+	V_ULDR="Sun Jan 01 2042 00:00:00"
 fi
 
 if [ -f /var/update/vmlinux.ub.gz ]; then