diff --git a/NeoBoot/bin/inithelp b/NeoBoot/bin/inithelp index 9348b8b..0a7c888 100644 --- a/NeoBoot/bin/inithelp +++ b/NeoBoot/bin/inithelp @@ -1,16 +1,13 @@ #!/bin/sh - NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot - echo -e "\n_________________________ Start inithelp __________________________>>>>" - if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then mnttest="nolocation" if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install ]; then orgimag1=`mount | sed '/sd/!d' | cut -d" " -f1` selectinstall=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` - for item in $orgimag1; do + for item in $orgimag1; do selectmnt=`blkid | find "$selectinstall" | cut -d" " -f1` if [ $selectmnt = $selectinstall ]; then echo -e "selectmnt="$selectmnt @@ -18,17 +15,15 @@ if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then mount $selectmnt `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 echo -e "Neoboot location detected. " fi - if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`ImageBoot ]; then echo "NeoBoot hasn't been installed on: " $selectinstall umount -l $NEODEVICE > /dev/null 2>&1 else echo -e "NEOBOOT has been installed on: " $selectmnt break; - fi + fi done fi - if [ $mnttest = "location" ] ; then break; else @@ -49,7 +44,6 @@ if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then fi done fi - if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh ]; then /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh @@ -57,11 +51,10 @@ if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then fi elif [ $mnttest == "label" ]; then echo -e "\n_________________________ NeoBoot mount by DEVICE_________________________ " - elif [ $mnttest == "location" ]; then + elif [ $mnttest == "location" ]; then echo -e "\n_______________________ NeoBoot mount by LOCATION _______________________ " fi fi - neoLOG=$NEODEVICE$IMAGEKATALOG/initneo.log if [ -f $neoLOG ]; then rm -f $neoLOG; touch $neoLOG @@ -73,7 +66,6 @@ echo "..............-=*[ NEOBOOT - BOOT UP ]*=-.............." >> $neoLOG echo " ____q(-_-)p____START NEXT Image...____q(-_-)p____ " >> $neoLOG echo "......................................................." >> $neoLOG echo ">>>>>>>>>>>>>>>>>>>>>> // START \\ >>>>>>>>>>>>>>>>>>> :" >> $neoLOG - if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then #if [ -f /proc/stb/info/vumodel ]; then ln -sfn /sbin/init.sysvinit /sbin/init @@ -84,12 +76,10 @@ if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then echo "#### __NEOBOOT - does not detect the location file neonextboot - Error - Back to Flash... __>>>>" >> $neoLOG sleep 5 fi - TARGET=Flash if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi - if [ $TARGET = "Flash" ]; then echo "BOOTNEO is booting image from " $TARGET /bin/umount /media/usb > /dev/null 2>&1 @@ -99,24 +89,21 @@ if [ $TARGET = "Flash" ]; then ln -sfn /sbin/init.sysvinit /sbin/init echo -e "\n----------------------------------" echo -e " BOOT UP IMAGE FROM FLASH " - echo -e "----------------------------------" + echo -e "----------------------------------" echo " REBOOT - UP IMAGE FROM FLASH " >> $neoLOG sleep 5 - PATH=/sbin:/bin:/usr/sbin:/usr/bin - reboot -d -f + PATH=/sbin:/bin:/usr/sbin:/usr/bin + #reboot -d -f #fi else ######### test boot new imaga>>>> - VUMODEL=`cat /proc/stb/info/vumodel` BOXNAME=`cat /etc/hostname` UPLOAD=ImagesUpload NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot - echo -e "\n ________ test boot new imaga ________>>>> " sleep 2 - if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/.control_ok ]; then [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..." sleep 2 @@ -136,11 +123,10 @@ else echo ">>> DONE <<<"; echo -n "END INIT INFO Rebooting... " sleep 15 - PATH=/sbin:/bin:/usr/sbin:/usr/bin - reboot -d -f + PATH=/sbin:/bin:/usr/sbin:/usr/bin + #reboot -d -f #fi fi - if [ -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then if [ ! -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ] ; then rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh @@ -152,12 +138,9 @@ else echo "NeoBOOT created the file mount enigma2_pre_start.sh " >> $neoLOG fi fi - fi - echo -e "\n_________________ END inithelp and start of the software__________________" echo "_________________ END inithelp and start of the software__________________" >> $neoLOG sleep 5 echo ok - exit 0 \ No newline at end of file