From 1e6c184a54bdf7b78998c61e3dd26399cf9eb572 Mon Sep 17 00:00:00 2001
From: gutosie <krzysztofgutosie@gmail.com>
Date: Tue, 16 Mar 2021 00:39:19 +0200
Subject: [PATCH] test 9.24

---
 NeoBoot/bin/inithelp      | 10 +++++-----
 NeoBoot/bin/neoinitmips   |  8 ++++----
 NeoBoot/bin/neoinitmipsvu | 30 +++++++++++-------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/NeoBoot/bin/inithelp b/NeoBoot/bin/inithelp
index 312b62c..9a0e1ed 100644
--- a/NeoBoot/bin/inithelp
+++ b/NeoBoot/bin/inithelp
@@ -103,11 +103,11 @@ else
     fi
     if [ $BOXHOSTNAME = "vuduo4k" ] || [ $BOXHOSTNAME = "vuduo4kse" ] || [ $BOXHOSTNAME = "vuzero4k" ] || [ $BOXHOSTNAME = "bm750" ] || [ $BOXHOSTNAME = "vuduo" ] || [ $BOXHOSTNAME = "vusolo" ] || [ $BOXHOSTNAME = "vuuno" ] || [ $BOXHOSTNAME = "vuultimo" ] || [ $BOXHOSTNAME = "vuultimo4k" ] || [ $BOXHOSTNAME = "vusolo4k" ] || [ $BOXHOSTNAME = "vuuno4kse" ] || [ $BOXHOSTNAME = "vuuno4k" ] || [ $BOXHOSTNAME = "vusolo2" ] || [ $BOXHOSTNAME = "vuduo2" ] || [ $BOXHOSTNAME = "vusolose" ] || [ $BOXHOSTNAME = "vuzero" ] ; then
             break;
-	else			
-			echo "  Neo-Boot start  boot manager. Waiting to change image - 20s "
-            /usr/bin/showiframe $NEOBOOT/neologo.mvi > /dev/null 2>&1
-			chmod 0755 $NEOBOOT/bin/neobm
-			$NEOBOOT/bin/neobm > /dev/null 2>&1
+	else
+                echo "  Neo-Boot start  boot manager. Waiting to change image - 20s "
+                /usr/bin/showiframe $NEOBOOT/neologo.mvi > /dev/null 2>&1
+                chmod 0755 $NEOBOOT/bin/neobm
+                $NEOBOOT/bin/neobm > /dev/null 2>&1
     fi
     if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then
         if [ ! -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ] ; then
diff --git a/NeoBoot/bin/neoinitmips b/NeoBoot/bin/neoinitmips
index 7430e1c..059ccc3 100644
--- a/NeoBoot/bin/neoinitmips
+++ b/NeoBoot/bin/neoinitmips
@@ -1,6 +1,6 @@
 #!/bin/sh
 #DESCRIPTION = This script mod. by gutosie
-#NeoBoot INIT Version: NEOBOOT VIP all stb MIPSEL with the boot manager
+#NeoBoot INIT Version: NEOBOOT VIP all stb MIPSEL with boot manager
 #Scrypt Unix Shell - init for neoboot
 NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot
 MODPROBE=/sbin/modprobe
@@ -203,8 +203,8 @@ else
 		          echo "====================================================> "
                   /bin/umount /media/usb > /dev/null 2>&1
                   /bin/umount /media/hdd > /dev/null 2>&1
-                  sleep 10
-		          reboot -f
+                  sleep 2
+		          break;
 	fi
 	TARGET=Flash
 	if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then
@@ -245,7 +245,7 @@ else
 		                        /bin/umount /media/usb > /dev/null 2>&1
 		                        /bin/umount /media/hdd > /dev/null 2>&1
                                 echo -n "<<<END INIT INFO Rebooting...>>>"
-		                        reboot -d -f
+		                        break;
                         fi
 		    fi
 		fi
diff --git a/NeoBoot/bin/neoinitmipsvu b/NeoBoot/bin/neoinitmipsvu
index 279cb02..03b35e5 100644
--- a/NeoBoot/bin/neoinitmipsvu
+++ b/NeoBoot/bin/neoinitmipsvu
@@ -2,15 +2,6 @@
 #script mod by gutosie
 #neo init arm 
 
-echo "====================================================> "
-echo " "
-echo "	    -=*[ NEOBOOT - BOOT UP ]*=-     "                      	                      
-echo "     NEO BOOT INIT Version: gutosie   "
-echo "	             q(-_-)p                "   
-echo " "
-echo "====================================================> "
-
-
 NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`        
 IMAGEKATALOG=ImageBoot
 
@@ -20,6 +11,14 @@ if [ -e /tmp/.init_reboot ]; then
 	  break;
 
 else
+    echo "====================================================> "
+    echo " "
+    echo "	    -=*[ NEOBOOT - BOOT UP ]*=-     "
+    echo "     NEO BOOT INIT Version: gutosie   "
+    echo "	             q(-_-)p                "
+    echo " "
+    echo "====================================================> "
+
 	if [ -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`IMAGEKATALOG/.neonextboot ]  ; then 	    
             CELBOOT=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
 	    if [ $CELBOOT = "Flash" ]; then 
@@ -30,7 +29,6 @@ else
                 break;
             fi
 	fi      
-
     
 	LIBDIR=/lib/modules/`uname -r`
 	if [ ! -d $LIBDIR ]; then
@@ -50,9 +48,6 @@ else
 	sleep 1
 	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 	/etc/init.d/mdev > /dev/null 2>&1
-
-
-############..>>>>>>>>
 	
 	sleep 5
 	mnttest="nouuid"
@@ -155,10 +150,7 @@ else
 
 	if [ -e /tmp/init_reboot ]; then
 		  break;
-	fi
-
-        
-###>>>>>>>>>>>>>>>>>        	
+	fi      	
 	
         UPLOAD=ImagesUpload
         mount /dev/sda1 /media/hdd
@@ -167,9 +159,9 @@ else
                 sleep 2
                 ln -sfn /sbin/init.sysvinit /sbin/init
                 echo "Flash "  > $NEODEVICE$IMAGEKATALOG/.neonextboot 
-                echo "Reinstall kernel -Press number 3"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
+                echo "Reinstall kernel"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
                 echo " Sending all processes the TERM- KILL signal..."
-                reboot -f
+                break;
 	fi