From ec0be77ea94b493d6b45d64dcc671eea7f0fca99 Mon Sep 17 00:00:00 2001 From: gutosie Date: Thu, 14 Feb 2019 09:21:28 +0100 Subject: [PATCH] 2.03 --- NeoBoot/bin/neoinitarmvu | 1 + NeoBoot/bin/neoinitmips | 52 +++++++++++++++++++-------------------- NeoBoot/bin/neoinitmipsvu | 50 +++++++++++++++++++------------------ NeoBoot/bin/rebootbot | 3 ++- 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/NeoBoot/bin/neoinitarmvu b/NeoBoot/bin/neoinitarmvu index d651477..4a7550f 100644 --- a/NeoBoot/bin/neoinitarmvu +++ b/NeoBoot/bin/neoinitarmvu @@ -113,6 +113,7 @@ else sync else if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then + echo " ***** gutosie _(*_*)_ TEST FIRST BOOT IMAGE - rebootbot ***** " echo "Reinstall kernel -Press number 3" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel ln -sfn /sbin/init.sysvinit /sbin/init echo "Flash " > /media/neoboot/ImageBoot/.neonextboot diff --git a/NeoBoot/bin/neoinitmips b/NeoBoot/bin/neoinitmips index b6b53e9..a6f7eb4 100644 --- a/NeoBoot/bin/neoinitmips +++ b/NeoBoot/bin/neoinitmips @@ -217,14 +217,35 @@ else break; fi fi - - sync - + TARGET=Flash if [ -f $IMAGEBOOT ]; then - TARGET=`cat $IMAGEBOOT` + TARGET=`cat $IMAGEBOOT` fi - +######### test boot new imaga>>>> + if [ -e $IMAGE/$TARGET/.control_ok ]; then + [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..." + #echo "No Error - Booting image normal... " + sync + else + if [ -e $IMAGE/$TARGET/.control_boot_new_image ]; then + echo "First start image - The first attempt to launch a new image... "; rm -f $IMAGE/$TARGET/.control_boot_new_image + sync + else + if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then + echo " ***** gutosie _(*_*)_ TEST FIRST BOOT IMAGE - rebootbot ***** " + echo "Reinstall kernel -Press number 3" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel + ln -sfn /sbin/init.sysvinit /sbin/init + echo "Flash " > /media/neoboot/ImageBoot/.neonextboot + sync + echo "Error - NeoBoot he can not run it image !!! " + echo "Restart STB - Back to Flash... " + sleep 8; reboot -f + fi + fi + fi +######### test boot new image<<<<< + if [ $TARGET = "Flash" ]; then echo "____________________________________" echo "____________________________________" @@ -297,27 +318,6 @@ else cd /media/neoboot/ImageBoot/$TARGET; -######### test boot new imaga>>>> - if [ -e $IMAGE/$TARGET/.control_ok ]; then - echo "No Error - Booting image normal ... "; sleep 2 - sync - else - if [ -e $IMAGE/$TARGET/.control_boot_new_image ]; then - echo "First start image - Proba uruchomienia nowego image... "; sleep 5; rm -r -f $IMAGE/$TARGET/.control_boot_new_image - sync - else - if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then - ln -sfn /sbin/init.sysvinit /sbin/init - echo "Flash " > /media/neoboot/ImageBoot/.neonextboot - sync - echo "Error - NeoBoot nie potrafi uruchomic tego image !!! " - echo "Restart STB - Back to Flash... " - sleep 7; reboot -f - fi - fi - fi -######### test boot new image<<<<< - if [ -f $IMAGE/$TARGET/sbin/init.sysvinit ]; then exec /usr/sbin/chroot . /sbin/init.sysvinit $* elif [ -f $IMAGE/$TARGET/sbin/init ]; then diff --git a/NeoBoot/bin/neoinitmipsvu b/NeoBoot/bin/neoinitmipsvu index c42182e..4b603a3 100644 --- a/NeoBoot/bin/neoinitmipsvu +++ b/NeoBoot/bin/neoinitmipsvu @@ -73,10 +73,35 @@ else echo "Used Kernel: Reinstall kernel !" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel reboot -f fi + TARGET=Flash if [ -f $IMAGEBOOT ]; then TARGET=`cat $IMAGEBOOT` - fi + fi +######### test boot new imaga>>>> + if [ -e $IMAGE/$TARGET/.control_ok ]; then + [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..." + #echo "No Error - Booting image normal... " + sync + else + if [ -e $IMAGE/$TARGET/.control_boot_new_image ]; then + echo "First start image - The first attempt to launch a new image... "; rm -f $IMAGE/$TARGET/.control_boot_new_image + sync + else + if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then + echo " ***** gutosie _(*_*)_ TEST FIRST BOOT IMAGE - rebootbot ***** " + echo "Reinstall kernel -Press number 3" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel + ln -sfn /sbin/init.sysvinit /sbin/init + echo "Flash " > /media/neoboot/ImageBoot/.neonextboot + sync + echo "Error - NeoBoot he can not run it image !!! " + echo "Restart STB - Back to Flash... " + sleep 8; reboot -f + fi + fi + fi +######### test boot new image<<<<< + if [ $TARGET = "Flash" ]; then echo "NEOBOOT is booting image from " $TARGET /bin/umount $NEO > /dev/null 2>&1 @@ -113,29 +138,6 @@ else done chmod 755 $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh - -######### test boot new imaga>>>> - if [ -e $IMAGE/$TARGET/.control_ok ]; then - echo "No Error - Booting image normal ... "; sleep 2 - sync - else - if [ -e $IMAGE/$TARGET/.control_boot_new_image ]; then - echo "First start image - Proba uruchomienia nowego image... "; sleep 5; rm -r -f $IMAGE/$TARGET/.control_boot_new_image - sync - else - if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then - ln -sfn /sbin/init.sysvinit /sbin/init - echo "Flash " > /media/neoboot/ImageBoot/.neonextboot - sync - echo "Error - NeoBoot nie potrafi uruchomic tego image !!! " - echo "Restart STB - Back to Flash... " - sleep 7; reboot -f - fi - fi - fi -######### test boot new image<<<< - - if [ -f $IMAGE/$TARGET/sbin/init.sysvinit ]; then exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init.sysvinit elif [ -f $IMAGE/$TARGET/sbin/init ]; then diff --git a/NeoBoot/bin/rebootbot b/NeoBoot/bin/rebootbot index a9bb61e..377bb15 100644 --- a/NeoBoot/bin/rebootbot +++ b/NeoBoot/bin/rebootbot @@ -1,5 +1,4 @@ #!/bin/sh -echo " ***** gutosie _(*_*)_ TEST FIRST BOOT IMAGE - rebootbot ***** " if [ ! -e /media/neoboot/ImageBoot/.neonextboot ]; then ln -sfn /sbin/init.sysvinit /sbin/init @@ -26,6 +25,8 @@ else sync else if [ ! -e $IMAGE/$TARGET/.control_ok ] ; then + echo " ***** gutosie _(*_*)_ TEST FIRST BOOT IMAGE - rebootbot ***** " + echo "Reinstall kernel -Press number 3" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel ln -sfn /sbin/init.sysvinit /sbin/init echo "Flash " > /media/neoboot/ImageBoot/.neonextboot sync