update 9.07

images

NeoBoot/__init__.py

@@ -9,7 +9,7 @@ PluginLanguagePath = 'Extensions/NeoBoot/locale'
 def localeInit():
     lang = language.getLanguage()[:2]
     os.environ['LANGUAGE'] = lang
-    print '[NeoBoot] set language to ', lang
+#    print '[NeoBoot] set language to ', lang
     gettext.bindtextdomain(PluginLanguageDomain, resolveFilename(SCOPE_PLUGINS, PluginLanguagePath))
 
 

NeoBoot/bin/inithelp

@@ -1,132 +0,0 @@
-#!/bin/sh       
-TARGET=Flash
-NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-IMAGEKATALOG=ImageBoot
-UPLOADKATALOG=ImagesUpload
-		
-if [ ! -e  $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then
-	            mnttest="nouuid"
-	            if [ -e $NEOBOOT/bin/install  ]; then
-    	                orgimag1=`mount | sed '/sd/!d' | cut -d" " -f1`
-		        selectinstall=`cat $NEOBOOT/bin/install`
-		        for item in $orgimag1; do
-			        selectmnt=`blkid | sed "/$selectinstall/!d" | cut -d":" -f1`
-			        if [ $selectmnt == $item ]; then
-				        echo "selectmnt=" $selectmnt
-                        	        mnttest="uuid"
-				        mount $selectmnt $NEODEVICE > /dev/null 2>&1
-			        fi
-			        if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
-				        echo "NEOBOOT hasn't been installed on: " $selectmnt
-				        umount $NEODEVICE > /dev/null 2>&1 
-			        else
-				        echo "NEOBOOT has been installed on: " $selectmnt
-				        break;
-			        fi 			
-		        done
-	            fi
-fi
-
-if [ ! -e $NEOBOOTMOUNT$IMAGE.neonextboot ] ; then    
-    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh 
-fi
-
-if [ ! -e  $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then
-          ln -sfn /sbin/init.sysvinit /sbin/init
-          echo "Flash "  >   $NEODEVICE$IMAGEKATALOG/.neonextboot
-          echo "Error - Back to Flash... "
-          sleep 5; #reboot -f
-fi 
-
-if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then
-	  TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-fi
-	
-
-if [ $TARGET = "Flash" ]; then
-		echo "BOOTNEO is booting image from " $TARGET 
-		/usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neowait.mvi > /dev/null 2>&1
-    sleep 3		
-		ln -sfn /sbin/init.sysvinit /sbin/init
-		#reboot -f
-else
-    ######### test boot new imaga>>>>
-    VUMODEL=$( cat /proc/stb/info/vumodel )
-    BOXNAME=$( cat /etc/hostname)
-    DIRECTORY=ImageBoot
-    UPLOAD=ImagesUpload	
-    DEVICEBOOT=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-    if [ -e $DEVICEBOOT$DIRECTORY/$TARGET/.control_ok ]; then
-        [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..."
-    elif [ -e $DEVICEBOOT$DIRECTORY/$TARGET/.control_boot_new_image ]; then
-        echo "First start image - The first attempt to launch a new image... "; rm -f $DEVICEBOOT$DIRECTORY/$TARGET/.control_boot_new_image 
-    else        
-	      if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/boot/zImage.$BOXNAME ]; then
-            VUMODEL=`cat /proc/stb/info/vumodel` 
-            BOXNAME=`cat /etc/hostname`
-            if [ ! -e $DEVICEBOOT$DIRECTORY/$TARGET/.control_ok ] ; then                                          
-                if [ $BOXNAME = "vuultimo4k" ] || [ $BOXNAME = "vusolo4k" ] || [ $BOXNAME = "vuuno4kse" ] || [ $BOXNAME = "vuuno4k" ]; then                                                         			        
-                    if [ -d /proc/stb ] ; then
-                        echo " Install kernel image flash.... " $BOXNAME
-                        dd if=$DEVICEBOOT$UPLOAD/.kernel/flash-kernel-$VUMODEL.bin of=/dev/mmcblk0p1
-                    fi
-                elif [ $BOXNAME = "vuzero4k" ] ; then                                                         			        
-                    if [ -d /proc/stb ] ; then
-                        echo " Install kernel image flash.... " $BOXNAME
-                        dd if=$DEVICEBOOT$UPLOAD/.kernel/flash-kernel-$VUMODEL.bin of=/dev/mmcblk0p4
-                    fi
-                elif [ $BOXNAME = "vuduo4k" ] ; then                                                         			        
-                    if [ -d /proc/stb ] ; then
-                        echo " Install kernel image flash.... " $BOXNAME
-                        dd if=$DEVICEBOOT$UPLOAD/.kernel/flash-kernel-$VUMODEL.bin of=/dev/mmcblk0p6
-                    fi
-                fi                                            
-            fi
-        fi    
-        echo "Wrong kernel. Press number 3"  > $DEVICEBOOT$UPLOAD/.kernel/used_flash_kernel
-        ln -sfn /sbin/init.sysvinit /sbin/init
-        echo "Flash "  > $DEVICEBOOT$DIRECTORY/.neonextboot
- 			  echo "Error - NeoBoot he can not run it image !!! "
- 			  echo "Restart STB - Back to Flash... "
-        /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1
-  		  sleep 10; #reboot -f   
-    fi
-
-    ######### test boot new image<<<<<
-    if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ] ; then
-        rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-    fi
-    cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-
-    #mount $NEODEVICE /media/neoboot 
-    if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ] ; then
-                                orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
-                                   for item in $orgimag; do
-                                       ohdd=`echo  $item | cut -d"/" -f3`
-                                       nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                       if [ $nhdd == '/media/usb' ]  ; then
-                                          echo $nhdd
-                                          echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                          echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                          echo "[NeoBOOT] created in /usr/bin the file enigma2_pre_start.sh "
-                                       elif [ $nhdd == '/media/hdd' ] ; then
-                                          echo $nhdd
-                                          echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                          echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                          echo "[NeoBOOT] created in /usr/bin the file enigma2_pre_start.sh "
-                                       else
-                                          echo "umount "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                          echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                          echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                          echo "[NeoBOOT] enigma2_pre_start.sh "
-                                          echo ok 
-                                       fi    
-                                   done                             
-    fi                            
-    chmod 0755 $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-    echo "NeoBOOT created the file mount enigma2_pre_start.sh "
-    sleep 2 
-fi
-                                   
-exit 0
-        

NeoBoot/bin/neoinitarmvu

@@ -1,294 +0,0 @@
-#!/bin/sh
-#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
-
-
-if [ -e /tmp/.init_reboot ]; then
-          rm /tmp/.init_reboot
-	  break;
-
-else
-	if [ -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`IMAGEKATALOG/.neonextboot ]  ; then 	    
-            CELBOOT=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-	    if [ $CELBOOT = "Flash" ]; then 
-                   exec /sbin/init.sysvinit $*	  
-                   exit 0
-            else
-                echo " "
-                break;
-            fi
-	fi      
-    
-	LIBDIR=/lib/modules/`uname -r`
-	if [ ! -d $LIBDIR ]; then
-		LIBDIR=/lib/modules/`ls /lib/modules | tail -n 1`
-	fi
-	echo "Mount kernel filesystems ..."	
-	if [ `mount | grep /proc | wc -l` -lt 1 ]; then	
-	        /bin/mount -a -t media         	             
-		/bin/mount -t proc proc /proc > /dev/null 2>&1
-		/bin/mount -t sysfs sysfs /sys > /dev/null 2>&1
-		/sbin/depmod -Ae > /dev/null 2>&1                 
-	fi 	
-
-	sleep 1
-
-	echo "NeoBoot is starting mdev and mout HDD USB ..."
-	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-	/etc/init.d/mdev > /dev/null 2>&1
-	
-	sleep 2
-	mnttest="nouuid"
-	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
-			selectmnt=`blkid | sed "/$selectinstall/!d" | cut -d":" -f1`
-			if [ $selectmnt == $item ]; then
-				echo "selectmnt=" $selectmnt
-                        	mnttest="uuid"
-				mount $selectmnt `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1
-			fi
-			if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`ImageBoot  ]; then
-				echo "NeoBoot hasn't been installed on: " $selectmnt
-				umount `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			else
-				echo "NeoBoot has been installed on: " $selectmnt
-				break;
-			fi 			
-		done
-	fi	
-	if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG  ]; then
-            mkdir -p /media/hdd > /dev/null 2>&1 
-            mkdir -p /media/usb > /dev/null 2>&1
-	fi
-	if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`  ]; then
-		mkdir `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1
-	fi
-	if [ $mnttest == "nouuid" ] ; then
-	        echo "NeoBoot mount by Device"
-		DEVICES1=`find /dev/sd??`
-		for DEVICE in $DEVICES1;
-		do
-			if [ -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`  ]; then
-				echo "neoboot checking installation on: " $DEVICE
-				mount $DEVICE `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			fi
-			if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`ImageBoot  ]; then
-				echo "NeoBoot hasn't been installed on: " $DEVICE
-				umount `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			else
-				echo "NeoBoot has been installed on: " $DEVICE
-				break;
-			fi 
-		done
-	elif [ $mnttest == "uuid" ]; then	
-		echo "NeoBoot mount by UUID"
-	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
-                echo "___________________neoMountpoint_______________________ " 
-                sleep 1
-	    fi                
-
-	fi
-
-        UPLOAD=ImagesUpload
-#        mount /dev/sda1 /media/hdd
-	if [ ! -e $NEODEVICE$IMAGEKATALOG ]; then
-                echo "Error mounting, Return to image Flash..."
-                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 " Sending all processes the TERM- KILL signal..."
-                reboot -f
-	fi
-
-	TARGET=Flash
-	if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then
-	  TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-	fi                                                                                               
-
-        HOSTNAME=`cat /etc/hostname`
-	if [ ! -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/boot/zImage.$HOSTNAME ]; then
-
-
-            echo "Image launched on a base kernel flash. "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/kernel_flash
-            
-	    MODPROBE=/sbin/modprobe
-
-	    echo "Load video and frame buffer modules ..."
-            #modprobe dvb
-
-	    echo "NeoBoot is loading modules"
-	    for mod in dvb; do
-		    $MODPROBE $mod
-	    done
-	
-	    # Hack for loading modules which are not loaded on diffrent kernel images
-	    /etc/init.d/modutils.sh
-	    #
-
-	    echo "Set BOOTLOGO ..."
-            sleep 1	
-                         
-	    cat /etc/videomode > /proc/stb/video/videomode
-
-    	    #we must wait until udev has created the video device
-	    (
-	    if [ -d /proc/stb ]; then
-		    while true; do
-			    if [ -e /dev/dvb/adapter0/video0 ]; then
-				    break;
-			    fi;
-		    done;
-	    fi;
-	    [ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neowait.mvi;
-	    ) &
-          
-            /etc/init.d/bootlogo > /dev/null 2>&1
-        
-            sleep 2
-            echo "Driverload end"
-
-	    if [ -f $LIBDIR/kernel/fs/autofs4/autofs4.ko ]; then
-		    /sbin/insmod $LIBDIR/kernel/fs/autofs4/autofs4.ko > /dev/null 2>&1
-	    fi
-	fi
-
-	if [ -e /tmp/init_reboot ]; then
-		  break;
-	fi
-	    	        
-	if [ $TARGET = "Flash" ]; then
-		echo "NEOBOOT is booting image from " $TARGET
-		/bin/umount /media/usb > /dev/null 2>&1
-		/bin/umount /media/hdd > /dev/null 2>&1
-		/usr/bin/showiframe /usr/share/bootlogo.mvi > /dev/null 2>&1
-		ln -sfn /sbin/init.sysvinit /sbin/init
-                echo "----------------------------------"
-	        echo "     BOOT UP IMAGE FROM FLASH     "
-                echo "----------------------------------"		
-	else                                                                                                                            
-                if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_ok ]; then
-	            echo "No Error - Booting image normal..."
-		else 
-		    if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_boot_new_image ]; then
-                        echo "First start image - The first attempt to launch a new image... "; 
-                        rm -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_boot_new_image > /dev/null 2>&1 
-		    else 
-		        HOSTNAME=`cat /etc/hostname` 
-                        if [ ! -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_ok ] ; then                                          
-                            if [ $HOSTNAME  = "vuultimo4k" ] || [ $HOSTNAME  = "vusolo4k" ] || [ $HOSTNAME  = "vuuno4kse" ] || [ $HOSTNAME  = "vuuno4k" ]; then                                                         			        
-                                dd if=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/flash-kernel-$HOSTNAME.bin of=/dev/mmcblk0p1
-                            elif [ $HOSTNAME  = "vuzero4k" ] ; then                                                         			        
-                                dd if=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/flash-kernel-$HOSTNAME.bin of=/dev/mmcblk0p4
-                            elif [ $HOSTNAME  = "vuduo4k" ] ; then                                                         			        
-                               dd if=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/flash-kernel-$HOSTNAME.bin of=/dev/mmcblk0p6                                            
-                            fi
-                            echo "Wrong kernel. Press number 3"  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/used_flash_kernel
-                            ln -sfn /sbin/init.sysvinit /sbin/init
-                            echo "Flash "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot                 	
-                            sleep 5; reboot -f              
-                        fi
-		    fi
-		fi 
-
-		echo "NeoBoot is booting" $TARGET " from " `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-		
-                if [ -d $NEODEVICE$IMAGEKATALOG/$TARGET ]; then
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev ]; then
-				sed -ie s!"\$4"!"\$3"!g $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev
-			fi
-
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi ]; then
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			else
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			fi
-
-			sleep 1
-                       			
-			/bin/mount -o bind /dev $NEODEVICE$IMAGEKATALOG/$TARGET/dev
-			/bin/mount -o bind /proc $NEODEVICE$IMAGEKATALOG/$TARGET/proc
-			/bin/mount -o bind /sys $NEODEVICE$IMAGEKATALOG/$TARGET/sys
-                        			
-			rm $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-			mkdir $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-
-                        rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                                                                          
-                            orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
-                               for item in $orgimag; do
-                                   ohdd=`echo  $item | cut -d"/" -f3`
-                                   nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                   if [ $nhdd == '$NEODEVICE' ]; then
-                                      echo $nhdd
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                   else
-                                      echo "umount "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                      echo ok 
-                                   fi    
-                               done	
-                       	if [ ! -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ]; then
-                            cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                       	fi
-                        chmod 755 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                                                                        
-                        echo "NeoBOOT created the file mount enigma2_pre_start.sh " 
-                        
-                        echo " [NEOBOOT] Use chroot ... exec /usr/sbin/chroot..."
-                                                                      
-			if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init.sysvinit ]; then   
-                                    echo "----------------------------------------"
-	                            echo "   -=*[ BOOT UP IMAGE FROM DISK ]*=-    "
-                                    echo "----------------------------------------"                                                                                                                     
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init.sysvinit
-			elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init ]; then                                    
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init        
-			else
-                                    echo " "                  
-                                    echo "                       NEOBOOT - ERROR !!!                                 "
-                                    echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE
-                                    echo "Check the correctness of unpacked catalogs in the selected one image.      "
-                                    echo "                      Back to image Flash...                             "
-                                                                    
-                                    /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1
-                                    ln -sfn /sbin/init.sysvinit /sbin/init
-                                    echo "Flash "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot
-                                    echo "Used Kernel: Reinstall kernel !"  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/used_flash_kernel
-                                    sleep 15; reboot -f
-
-			fi
-			exit 0
-		fi
-	fi
-fi
-
-# boot Flash 
-
-if [ -f /sbin/init.sysvinit ]; then
-		#echo "Running /sbin/init.sysvinit"
-		exec /sbin/init.sysvinit $1
-fi
-
-exit 0
-;;
-esac
-exit

NeoBoot/bin/neoinitarmvuDuo4k

@@ -1,275 +0,0 @@
-#!/bin/sh
-#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
-
-
-if [ -e /tmp/.init_reboot ]; then
-          rm /tmp/.init_reboot
-	  break;
-
-else
-	if [ -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`IMAGEKATALOG/.neonextboot ]  ; then 	    
-            CELBOOT=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-	    if [ $CELBOOT = "Flash" ]; then 
-                   exec /sbin/init.sysvinit $*	  
-                   exit 0
-            else
-                echo " "
-                break;
-            fi
-	fi      
-
-    
-	LIBDIR=/lib/modules/`uname -r`
-	if [ ! -d $LIBDIR ]; then
-		LIBDIR=/lib/modules/`ls /lib/modules | tail -n 1`
-	fi
-	echo "Mount kernel filesystems ..."	
-	if [ `mount | grep /proc | wc -l` -lt 1 ]; then	
-	        /bin/mount -a        	             
-		/bin/mount -t proc proc /proc > /dev/null 2>&1
-		/bin/mount -t sysfs sysfs /sys > /dev/null 2>&1
-		/sbin/depmod -Ae > /dev/null 2>&1                 
-	fi 	
-
-	sleep 5
-
-	echo "NeoBoot is starting mdev and mout HDD USB ..."
-	sleep 1
-	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-	/etc/init.d/mdev > /dev/null 2>&1
-
-
-############..>>>>>>>>
-	
-	sleep 5
-	mnttest="nouuid"
-	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
-			selectmnt=`blkid | sed "/$selectinstall/!d" | cut -d":" -f1`
-			if [ $selectmnt == $item ]; then
-				echo "selectmnt=" $selectmnt
-                        	mnttest="uuid"
-				mount $selectmnt `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1
-			fi
-			if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`ImageBoot  ]; then
-				echo "NeoBoot hasn't been installed on: " $selectmnt
-				umount `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			else
-				echo "NeoBoot has been installed on: " $selectmnt
-				break;
-			fi 			
-		done
-	fi	
-	if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG  ]; then
-            mkdir -p /media/hdd > /dev/null 2>&1 
-            mkdir -p /media/usb > /dev/null 2>&1
-	fi
-	if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`  ]; then
-		mkdir `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1
-	fi
-	if [ $mnttest == "nouuid" ] ; then
-	        echo "NeoBoot mount by Device"
-		DEVICES1=`find /dev/sd??`
-		for DEVICE in $DEVICES1;
-		do
-			if [ -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`  ]; then
-				echo "neoboot checking installation on: " $DEVICE
-				mount $DEVICE `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			fi
-			if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`ImageBoot  ]; then
-				echo "NeoBoot hasn't been installed on: " $DEVICE
-				umount `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` > /dev/null 2>&1 
-			else
-				echo "NeoBoot has been installed on: " $DEVICE
-				break;
-			fi 
-		done
-	elif [ $mnttest == "uuid" ]; then	
-		echo "NeoBoot mount by UUID"
-	fi
-
-	if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot  ]; then
-	    if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh  ]; then
-                /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh
-                echo "___________________neoMountpoint_______________________ " 
-                sleep 1
-	    fi                
-
-	fi
-
-	MODPROBE=/sbin/modprobe
-
-	echo "Load video and frame buffer modules ..."
-        #modprobe dvb
-
-	echo "NeoBoot is loading modules"
-	for mod in dvb; do
-		$MODPROBE $mod
-	done
-	
-	# Hack for loading modules which are not loaded on diffrent kernel images
-	/etc/init.d/modutils.sh
-	#
-
-	echo "Set BOOTLOGO ..."
-        sleep 1	
-        
-                 
-	cat /etc/videomode > /proc/stb/video/videomode
-
-	#we must wait until udev has created the video device
-	(
-	if [ -d /proc/stb ]; then
-		while true; do
-			if [ -e /dev/dvb/adapter0/video0 ]; then
-				break;
-			fi;
-		done;
-	fi;
-	[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neowait.mvi;
-	) &
-          
-        /etc/init.d/bootlogo > /dev/null 2>&1
-        
-        sleep 2
-        echo "Driverload end"
-
-	if [ -f $LIBDIR/kernel/fs/autofs4/autofs4.ko ]; then
-		/sbin/insmod $LIBDIR/kernel/fs/autofs4/autofs4.ko > /dev/null 2>&1
-	fi
-
-	if [ -e /tmp/init_reboot ]; then
-		  break;
-	fi
-
-        
-###>>>>>>>>>>>>>>>>>        	
-	
-        UPLOAD=ImagesUpload
-        mount /dev/sda1 /media/hdd
-	if [ ! -e $NEODEVICE$IMAGEKATALOG ]; then
-                echo "Error mounting, Return to image Flash..."
-                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 " Sending all processes the TERM- KILL signal..."
-                reboot -f
-	fi
-
-
-	TARGET=Flash
-	if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then
-	  TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-	fi
-	        
-	if [ $TARGET = "Flash" ]; then
-		echo "NEOBOOT is booting image from " $TARGET
-		/bin/umount /media/usb > /dev/null 2>&1
-		/bin/umount /media/hdd > /dev/null 2>&1
-		/usr/bin/showiframe /usr/share/bootlogo.mvi > /dev/null 2>&1
-		sync; ln -sfn /sbin/init.sysvinit /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh
-                echo "----------------------------------"
-	        echo "     BOOT UP IMAGE FROM FLASH     "
-                echo "----------------------------------"		
-	else
-                                                                                                                            
-		echo "NeoBoot is booting" $TARGET " from " `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-		
-                if [ -d $NEODEVICE$IMAGEKATALOG/$TARGET ]; then
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev ]; then
-				sed -ie s!"\$4"!"\$3"!g $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev
-			fi
-
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi ]; then
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			else
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			fi
-
-			sleep 1
-                       			
-			/bin/mount -o bind /dev $NEODEVICE$IMAGEKATALOG/$TARGET/dev
-			/bin/mount -o bind /proc $NEODEVICE$IMAGEKATALOG/$TARGET/proc
-			/bin/mount -o bind /sys $NEODEVICE$IMAGEKATALOG/$TARGET/sys
-                        			
-			rm $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-			mkdir $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-
-                        rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                      
-                                                    
-                            orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
-                               for item in $orgimag; do
-                                   ohdd=`echo  $item | cut -d"/" -f3`
-                                   nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                   if [ $nhdd == '$NEODEVICE' ]; then
-                                      echo $nhdd
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                   else
-                                      echo "umount "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                      echo ok 
-                                   fi    
-                               done	
-                       	if [ ! -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ]; then
-                            cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                       	fi
-                        chmod 755 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                                                                        
-                        echo "NeoBOOT created the file mount enigma2_pre_start.sh " 
-                        
-                        echo " [NEOBOOT] Use chroot ... exec /usr/sbin/chroot..."
-                                                                      
-			if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init.sysvinit ]; then   
-                                    echo "----------------------------------------"
-	                            echo "   -=*[ BOOT UP IMAGE FROM DISK ]*=-    "
-                                    echo "----------------------------------------"                                                                                                                     
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init.sysvinit
-			elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init ]; then                                    
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init        
-			else
-                                    echo " "                  
-                                    echo "                       NEOBOOT - ERROR !!!                                 "
-                                    echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE
-                                    echo "Check the correctness of unpacked catalogs in the selected one image.      "
-                                    echo "                      Back to image Flash...                             "
-                                                                    
-                                    /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1
-                                    sync; ln -sfn /sbin/init.sysvinit /sbin/init
-                                    echo "Flash "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot
-                                    echo "Used Kernel: Reinstall kernel !"  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/used_flash_kernel
-                                    sleep 15; reboot -f
-
-			fi
-			exit 0
-		fi
-	fi
-fi
-
-# boot Flash 
-
-if [ -f /sbin/init.sysvinit ]; then
-		#echo "Running /sbin/init.sysvinit"
-		exec /sbin/init.sysvinit $1
-fi
-
-exit 0
-;;
-esac
-exit

NeoBoot/bin/neoinitmips

@@ -1,26 +1,24 @@
 #!/bin/sh 
 #DESCRIPTION = This script mod. by gutosie
-#NeoBoot INIT 
+#NeoBoot INIT Version: 6.00
 #Scrypt Unix Shell - init for neoboot 
 
-echo "====================================================> "
+IMAGE=/media/neoboot/ImageBoot
-echo " "
+IMAGEBOOT=/media/neoboot/ImageBoot/.neonextboot
-echo "	    -=*[ NEOBOOT - BOOT UP ]*=-     "                      	                      
+NEO=/media/neoboot
-echo "     NEO BOOT INIT Version: gutosie   "
+NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot
-echo "	             q(-_-)p                "   
+MODPROBE=/sbin/modprobe
-echo " "
+BOXNAME=`cat /etc/hostname`
-echo "====================================================> "
+FINDBOOT=/media/*/ImageBoot/.neonextboot
 
-NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`        
-IMAGEKATALOG=ImageBoot
 
 if [ -e /tmp/.init_reboot ]; then
           rm /tmp/.init_reboot
 	  break;
 
 else        
-	if [ -e $NEODEVICE$IMAGEKATALOG ]  ; then 	    
+	if [ -e $FINDBOOT ]  ; then 	    
-            CELBOOT=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
+            CELBOOT=`cat $FINDBOOT`
 	    if [ $CELBOOT = "Flash" ]; then 
                    exec /sbin/init.sysvinit $*	  
                    exit 0
@@ -30,6 +28,22 @@ else
             fi
 	fi      
 
+        echo "====================================================> "
+        echo " "
+        echo "	    -=*[ NEOBOOT - BOOT UP ]*=- "                      	                      
+        echo " NEO BOOT INIT Version: 6.00 Update 6.15 16-11-2017   "
+        echo "	             q(-_-)p           "   
+        echo " "
+        echo "====================================================> "
+	
+	/etc/init.d/sysfs.sh
+	/etc/init.d/modutils.sh
+	
+	echo "NEOBOOT is starting mdev"
+        echo " "
+	echo "/sbin/mdev" > /proc/sys/kernel/hotplug
+	/etc/init.d/mdev > /dev/null 2>&1
+	
 	mknod /dev/sda b  8 0
 	mknod /dev/sda1 b 8 1
 	mknod /dev/sda2 b 8 2
@@ -52,6 +66,36 @@ else
 
 	sleep 1
 	
+	if [ -e /etc/videomode ]; then
+	    cat /etc/videomode > /proc/stb/video/videomode
+	fi
+	if [ -e /etc/videomode2 ]; then
+	    cat /etc/videomode2 > /proc/stb/video/videomode
+	fi
+
+	(
+	if [ -d /proc/stb ]; then
+		while true; do
+			if [ -e /dev/dvb/adapter0/video0 ]; then
+				break;
+			fi;
+		done;
+	fi;
+	[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe $NEOBOOT/neowait.mvi;
+
+	) &
+	
+	DEVICES1=`find /dev/sd??`
+	for DEVICE in $DEVICES1;
+	do
+		if [ ! -e /media/neoboot/ImageBoot/.neonextboot  ]; then
+     		mount $DEVICE /media/neoboot > /dev/null 2>&1
+    	fi                    
+   		if [ ! -e /media/neoboot/ImageBoot/.neonextboot  ]; then
+       		umount /media/neoboot > /dev/null 2>&1 
+    	fi 
+	done
+
 	LIBDIR=/lib/modules/`uname -r`
 	if [ ! -d $LIBDIR ]; then
 		LIBDIR=/lib/modules/`ls /lib/modules | tail -n 1`
@@ -63,29 +107,24 @@ else
 		/sbin/depmod -Ae > /dev/null 2>&1
 	fi
 
-        echo "NeoBoot is starting mdev and mout HDD USB ..."
+	sleep 1
-        echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-        /etc/init.d/mdev > /dev/null 2>&1
-
-	sleep 5
         echo " "
-
-############..>>>>>>>>        
         echo "Search NEOBOOT... "
+        #sed=grep
 	mnttest="nouuid"
 	if [ -e $NEOBOOT/bin/install  ]; then
-    	                orgimag1=`mount | sed '/sd/!d' | cut -d" " -f1`
+        	orgimag1=`mount | grep '/sd/!d' | cut -d" " -f1`
 		selectinstall=`cat $NEOBOOT/bin/install`
 		for item in $orgimag1; do
-			        selectmnt=`blkid | sed "/$selectinstall/!d" | cut -d":" -f1`
+			selectmnt=`blkid | grep "/$selectinstall/!d" | cut -d":" -f1`
 			if [ $selectmnt == $item ]; then
 				echo "selectmnt=" $selectmnt
                         	mnttest="uuid"
-				        mount $selectmnt $NEODEVICE > /dev/null 2>&1
+				mount $selectmnt $NEO > /dev/null 2>&1
 			fi
-			        if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+			if [ ! -e $IMAGE  ]; then
 				echo "NEOBOOT hasn't been installed on: " $selectmnt
-				        umount $NEODEVICE > /dev/null 2>&1 
+				umount $NEO > /dev/null 2>&1 
 			else                                
 				echo "NEOBOOT has been installed on: " $selectmnt
 				break;
@@ -93,226 +132,191 @@ else
 		done
 	fi	
 
-	            if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+	if [ ! -e $NEO  ]; then
-	                mkdir $NEODEVICE > /dev/null 2>&1
+		mkdir $NEO > /dev/null 2>&1
 	fi
 
-	            if [ $mnttest="nouuid" ] ; then
+	if [ $mnttest == "nouuid" ]; then
-	                echo "NeoBoot mount by Device"
+	        echo "NEOBOOT mount by Device"
 		DEVICES1=`find /dev/sd??`
 		for DEVICE in $DEVICES1;
 		do
-			        if [ -e $NEODEVICE  ]; then
+			if [ -e $NEO  ]; then
-				        echo "neoboot checking installation on: " $DEVICE
+				echo "NEOBOOT checking installation on: " $DEVICE
-				        mount $DEVICE $NEODEVICE > /dev/null 2>&1 
+				mount $DEVICE $NEO > /dev/null 2>&1 
 			fi
-
+			if [ ! -e $IMAGE  ]; then
-			        if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+				echo "NEOBOOT hasn't been installed on:" $DEVICE
-				        echo "NeoBoot hasn't been installed on: " $DEVICE
+				umount $NEO > /dev/null 2>&1 
-				        umount $NEODEVICE > /dev/null 2>&1 
 			else
-				        echo "NEOBOOTt has been installed on: " $DEVICE
+				echo "NEOBOOT has been installed on: " $DEVICE
 				break;
 			fi 
 		done
-	            elif [ $mnttest="uuid" ]; then	
+	elif [ $mnttest == "uuid" ]; then	
 		echo "NEOBOOT mount by UUID"
 	fi	
 
-###>>>>>>>>>>>>>>>>>  
-	
-
         #dodatkowe szukanie neoboota
         #mount /dev/sdb1 $NEO > /dev/null 2>&1  # <<< tu mozesz zmienic sdb1 i wpisac Twoje montowanie dysku dla neoboot
 
-	MODPROBE=/sbin/modprobe
+        echo "NEOBOOT is loading modules."
-
-	echo "Load video and frame buffer modules ..."
-        modprobe dvb
-
-	echo "NeoBoot is loading modules"
         for mod in dvb; do
                   echo "=======================> NeoBoot is loading modules"
               $MODPROBE $mod
         done
 
-	# Hack for loading modules which are not loaded on diffrent kernel images
-	/etc/init.d/sysfs.sh
-	/etc/init.d/modutils.sh	
-
-	#
-	echo "Set BOOTLOGO ..."
-        sleep 1	
-                         
-	cat /etc/videomode > /proc/stb/video/videomode
-
-	#we must wait until udev has created the video device
-	(
-	if [ -d /proc/stb ]; then
-		while true; do
-			if [ -e /dev/dvb/adapter0/video0 ]; then
-				break;
-			fi;
-		done;
-	fi;
-	[ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neowait.mvi;
-	) &
-          
-        /etc/init.d/bootlogo > /dev/null 2>&1
-        
-        sleep 2
-        echo "Driverload end"
-
 	if [ -f $LIBDIR/kernel/fs/autofs4/autofs4.ko ]; then
 		/sbin/insmod $LIBDIR/kernel/fs/autofs4/autofs4.ko > /dev/null 2>&1
 	fi
 		          
-	if [ -e /tmp/init_reboot ]; then
+        sleep 1
-		  break;
+
+	if [ -e $NEOBOOT/bin/fbclear ]; then
+	        $NEOBOOT/bin/fbclear; $NEOBOOT/bin/fbclear; $NEOBOOT/bin/fbclear; $NEOBOOT/bin/fbclear > /dev/null 2>&1
         fi
 
-	if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/neobm ]; then
+
+	if [ -e $NEOBOOT/bin/neobm ]; then
             echo "  Neo-Boot start  boot manager  "
             echo "  Waiting to change image - 20s "
             echo " "
-	    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neologo.mvi > /dev/null 2>&1
+	    chmod 0755 $NEOBOOT/bin/neobm
+	    $NEOBOOT/neologo.mvi > /dev/null 2>&1
 	    sleep 1
-	    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/neobm > /dev/null 2>&1
+	    $NEOBOOT/bin/neobm > /dev/null 2>&1
-	    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/fbclear > /dev/null 2>&1
 	fi
 	
-
+	if [ ! -e $IMAGEBOOT ]; then
-#>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-	   	
-        UPLOAD=ImagesUpload
-	if [ ! -e $NEODEVICE$IMAGEKATALOG ]; then
-                echo "Error mounting, Return to image Flash..."
-                sleep 2
 		  ln -sfn /sbin/init.sysvinit /sbin/init
-                echo "Flash "  > $NEODEVICE$IMAGEKATALOG/.neonextboot 
+                  echo "Flash "  > $IMAGEBOOT
-                echo "Reinstall kernel -Press number 3"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
+                  echo "Used Kernel: Reinstall kernel !"  > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel
-                echo " Sending all processes the TERM- KILL signal..."
 		  reboot -f
 	fi
 
-        #ln -sfn /sbin/init.sysvinit /sbin/init   #<<<<___after adding it will return to image flash
+
+	TARGETIMAGE=`cat $IMAGEBOOT`
+        if [ $TARGETIMAGE = "BlackHoleVU" ] || [ $TARGETIMAGE = "BlackHoleVU+" ] ; then       	    
+            if ! [ -e $NEO/ImagesUpload/.kernel/used_bh_kernel ]; then
+                rm -f $IMAGEBOOT
+                echo "Flash "  >> $IMAGEBOOT 
+                echo "Halt init image - " $TARGETIMAGE 
+                echo "Start image Flash...  "  
+                $NEOBOOT/bh.mvi > /dev/null 2>&1
+                sync; sleep 1
+                exec /sbin/init.sysvinit $* 
+                exit 0
+            else
+                 break;
+            fi
+	fi
+
+        sync
 	
 	TARGET=Flash
-	if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then
+	if [ -f $IMAGEBOOT ]; then
-	  TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
+        	TARGET=`cat $IMAGEBOOT`
 	fi
 		
 	if [ $TARGET = "Flash" ]; then
+                echo "____________________________________"
+                echo "____________________________________"
+                echo " "
 		echo "NEOBOOT is booting image from " $TARGET
+                echo "____________________________________"
+                echo "____________________________________"
+		/bin/umount $NEO > /dev/null 2>&1
 		/bin/umount /media/usb > /dev/null 2>&1
 		/bin/umount /media/hdd > /dev/null 2>&1              
                 /usr/bin/showiframe /usr/share/bootlogo.mvi > /dev/null 2>&1
-		sync; ln -sfn /sbin/init.sysvinit /sbin/init#; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
                 echo "----------------------------------"
 	        echo "     BOOT UP IMAGE FROM FLASH     "
                 echo "----------------------------------"
 	else
-                                                 
+		        echo " " 
-                ######### test boot new imaga>>>>                                                             
+		        echo "NEOBOOT is booting image" $TARGET " from " $DEVICE
-                if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/.control_ok ]; then
+		        echo " " 
-	                        [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..."
+		        if [ -d $IMAGE/$TARGET ]; then
-                else 
+			        if [ -f $IMAGE/$TARGET/etc/init.d/udev ]; then
-          			if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/.control_boot_new_image ]; then
+				       sed -ei s!"\$4"!"\$3"!g $IMAGE/$TARGET/etc/init.d/udev
-                    			echo "First start image - The first attempt to launch a new image... "; rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/.control_boot_new_image 
-          			else    
-              			        echo "Wrong kernel. Press number 3"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
-                    			ln -sfn /sbin/init.sysvinit /sbin/init
-                    			echo "Flash "  > $NEODEVICE$IMAGEKATALOG/.neonextboot
-                    			echo "Error - NeoBoot he can not run it image !!! "
-                    			echo "Restart STB - Back to Flash... "
-                                        echo "NeoBoot is booting" $TARGET                     			
-                    			sleep 5; reboot -f   
-          			fi
-                fi
-                ######### test boot new image<<<<<               
-                                                                
-		echo "NeoBoot is booting" $TARGET " from " `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-		
-                if [ -d $NEODEVICE$IMAGEKATALOG/$TARGET ]; then
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev ]; then
-				sed -ie s!"\$4"!"\$3"!g $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev
 			        fi
 
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi ]; then
+			        if [ -f $IMAGE/$TARGET/usr/share/bootlogo.mvi ]; then
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
+				        /usr/bin/showiframe $IMAGE/$TARGET/usr/share/bootlogo.mvi > /dev/null 2>&1
-			else
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
 			        fi
                                                 			
 			        sleep 1
 
-			/bin/mount -o bind /dev $NEODEVICE$IMAGEKATALOG/$TARGET/dev
+			        /bin/mount -o bind /dev $IMAGE/$TARGET/dev
-			/bin/mount -o bind /proc $NEODEVICE$IMAGEKATALOG/$TARGET/proc
+			        /bin/mount -o bind /proc $IMAGE/$TARGET/proc
-			/bin/mount -o bind /sys $NEODEVICE$IMAGEKATALOG/$TARGET/sys
+			        /bin/mount -o bind /sys $IMAGE/$TARGET/sys
-                        			
+			        rm $IMAGE/$TARGET/media/neoboot > /dev/null 2>&1
-			rm $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
+			        mkdir $IMAGE/$TARGET/media/neoboot > /dev/null 2>&1
-			mkdir $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-                     
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ]; then
-				rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh > /dev/null 2>&1
-			fi
-
-                        cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                                    
                                 orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
+                                rm -f $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
                                    for item in $orgimag; do
                                        ohdd=`echo  $item | cut -d"/" -f3`
                                        nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                   if [ $nhdd == '`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`' ]; then
+                                       if [ $nhdd == '$NEO' ]; then
                                           echo $nhdd
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                          echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
                                        else
-                                      echo "umount "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "umount "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                          echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
-                                      echo ok 
                                        fi    
                                    done	
                            
-                        chmod 755 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                                                                        
+                                if [ -f $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh ]; then 
-                        echo "NeoBOOT created the file mount enigma2_pre_start.sh " 
+                                    chmod 755 $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh	
-                        
+                                fi                                                                                                                              
-                        echo " [NEOBOOT] Use chroot ... exec /usr/sbin/chroot..."
-                                                                      
-			if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init.sysvinit ]; then   
                                 echo "----------------------------------------"
 	                        echo "   -=*[ BOOT UP IMAGE FROM DISK ]*=-    "
                                 echo "----------------------------------------"
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init.sysvinit
+
-			elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init ]; then                                    
+
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init        
+			        if [ ! -f /media/neoboot/ImageBoot/$TARGET/media/neoboot/ImageBoot/.neonextboot ]; then
+                                    /bin/mount -o bind /media/neoboot /media/neoboot/ImageBoot/$TARGET/media/neoboot
+			        fi
+
+			        DEVICES1=`ls /media`
+			        for DEVICE in $DEVICES1;
+			        do
+			                if [ -f /media/$DEVICE/ImageBoot/.neonextboot ]; then
+				                /bin/mount -o bind /media/neoboot /media/neoboot/ImageBoot/$TARGET/media/$DEVICE
+			        fi
+			        done
+
+		                cd /media/neoboot/ImageBoot/$TARGET;
+
+                                if [ -f $IMAGE/$TARGET/sbin/init.sysvinit ]; then                                    
+                                    exec /usr/sbin/chroot . /sbin/init.sysvinit $*
+                                elif [ -f $IMAGE/$TARGET/sbin/init ]; then                                    
+                                    exec /usr/sbin/chroot . /sbin/init $*       
                                 else
                                     echo " "
                                     echo "                       NEOBOOT - ERROR !!!                                 "
-                                    echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE
+                                    echo "Nie odnaleziono poprawnie rozpakowanego image "$TARGET" z partycji " $DEVICE
-                                    echo "Check the correctness of unpacked catalogs in the selected one image.      "
+                                    echo " Sprawdz poprawnosc rozpakowanych katalogow w wybranym image.              "
-                                    echo "                      Back to image Flash...                             "                                                                    
+                                    echo "                      Powrot do image Flash...                             "
-                                    /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1
+                                    rm -f $IMAGEBOOT; touch $IMAGEBOOT; echo "Flash "  >> $IMAGEBOOT 
-                                    sync; ln -sfn /sbin/init.sysvinit /sbin/init
+                                    /usr/bin/showiframe $NEOBOOT/error.mvi > /dev/null 2>&1
-                                    echo "Flash "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot
+                                    sync; sleep 10; exec /sbin/init.sysvinit $*
-                                    echo "Used Kernel: Reinstall kernel !"  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/used_flash_kernel
-                                    sleep 15; reboot -f
 
                                 fi
 			        exit 0
+
 		        fi
 	fi
 fi
 
-# boot Flash 
-
 if [ -f /sbin/init.sysvinit ]; then                                
-		#echo "Running /sbin/init.sysvinit"
+                exec /sbin/init.sysvinit $*
-		exec /sbin/init.sysvinit $1
 fi
 
 exit 0
 ;;
 esac
 exit
+ 

NeoBoot/bin/neoinitmipsvu

@@ -1,309 +1,136 @@
 #!/bin/sh
-#DESCRIPTION = This script mod. by gutosie
+#script mod by gutosie
-#NeoBoot INIT 
+IMAGE=/media/neoboot/ImageBoot
-#Scrypt Unix Shell - init for neoboot 
+IMAGEBOOT=/media/neoboot/ImageBoot/.neonextboot          
-
+NEO=/media/neoboot
-echo "====================================================> "
+NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot
-echo " "
+MODPROBE=/sbin/modprobe
-echo "	    -=*[ NEOBOOT - BOOT UP ]*=-     "                      	                      
+BOXNAME=`cat /etc/hostname`
-echo "     NEO BOOT INIT Version: gutosie   "
+FINDBOOT=/media/*/ImageBoot/.neonextboot
-echo "	             q(-_-)p                "   
+CELBOOT=`cat $FINDBOOT`
-echo " "
-echo "====================================================> "
-
-NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`        
-IMAGEKATALOG=ImageBoot
-
-if [ -e /tmp/.init_reboot ]; then
-          rm /tmp/.init_reboot
-	  break;
 
+if [ $CELBOOT = "Flash" ] || [ -e /tmp/.init_reboot ] ; then 
+	exec /sbin/init.sysvinit $1	                               
 else         
-	if [ -e $NEODEVICE$IMAGEKATALOG ]  ; then 	    
-            CELBOOT=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
-	    if [ $CELBOOT = "Flash" ]; then 
-                   exec /sbin/init.sysvinit $*	  
-                   exit 0
-            else
-                echo " "
-                break;
-            fi
-	fi     
-			
-	mknod /dev/sda b  8 0
-	mknod /dev/sda1 b 8 1
-	mknod /dev/sda2 b 8 2
-	mknod /dev/sdb b  8 16
-	mknod /dev/sdb1 b 8 17
-	mknod /dev/sdb2 b 8 18
-	mknod /dev/sdc b  8 32
-	mknod /dev/sdc1 b 8 33
-	mknod /dev/sdc2 b 8 34
-	mknod /dev/sdd b  8 48
-	mknod /dev/sdd1 b 8 49
-	mknod /dev/sdd2 b 8 50
-
-	mkdir /dev/input
-	mknod /dev/input/event0 c 13 64
-
-	mknod /dev/fb0 c 29 0
-	mkdir /dev/fb
-	ln -s ../fb0 /dev/fb/0
-
-	sleep 1
-	
 	LIBDIR=/lib/modules/`uname -r`
 	if [ ! -d $LIBDIR ]; then
 		LIBDIR=/lib/modules/`ls /lib/modules | tail -n 1`
 	fi
-        
 	if [ `mount | grep /proc | wc -l` -lt 1 ]; then
 		/bin/mount -t proc proc /proc > /dev/null 2>&1
 		/bin/mount -t sysfs sysfs /sys > /dev/null 2>&1
 		/sbin/depmod -Ae > /dev/null 2>&1                
 	fi 
-
+	sleep 2
-        echo "NeoBoot is starting mdev and mout HDD USB ..."
-        echo "/sbin/mdev" > /proc/sys/kernel/hotplug
-        /etc/init.d/mdev > /dev/null 2>&1
-
-	sleep 5
-        echo " "        
-
-############..>>>>>>>>        
-        echo "Search NEOBOOT... "		
 	mnttest="nouuid"
 	if [ -e $NEOBOOT/bin/install  ]; then
         	orgimag1=`mount | sed '/sd/!d' | cut -d" " -f1`
 		selectinstall=`cat $NEOBOOT/bin/install`
 		for item in $orgimag1; do
-			        selectmnt=`blkid | sed "/$selectinstall/!d" | cut -d":" -f1`
+			selectmnt=`blkid | sed '/$selectinstall/!d' | cut -d":" -f1`
 			if [ $selectmnt == $item ]; then
 				echo "selectmnt=" $selectmnt
                         	mnttest="uuid"
-				        mount $selectmnt $NEODEVICE > /dev/null 2>&1
+				mount $selectmnt $NEO > /dev/null 2>&1
 			fi
-			        if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+			if [ ! -e $NEO/ImageBoot  ]; then
 				echo "NEOBOOT hasn't been installed on: " $selectmnt
-				        umount $NEODEVICE > /dev/null 2>&1 
+				umount $NEO > /dev/null 2>&1 
 			else
 				echo "NEOBOOT has been installed on: " $selectmnt
 				break;
 			fi 			
 		done
 	fi	
-     
+	if [ ! -e $NEO  ]; then
-	            if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+		mkdir $NEO > /dev/null 2>&1
-	                mkdir $NEODEVICE > /dev/null 2>&1
 	fi        
-
+	if [ $mnttest == "nouuid" ] ; then
-	            if [ $mnttest="nouuid" ] ; then
 	        echo "NeoBoot mount by Device"
 		DEVICES1=`find /dev/sd??`
 		for DEVICE in $DEVICES1;
 		do
-			        if [ -e $NEODEVICE  ]; then
+			if [ -e $NEO  ]; then
 				echo "neoboot checking installation on: " $DEVICE
-				        mount $DEVICE $NEODEVICE > /dev/null 2>&1 
+				mount $DEVICE $NEO > /dev/null 2>&1 
 			fi
 
-			        if [ ! -e $NEODEVICE$IMAGEKATALOG  ]; then
+			if [ ! -e $NEO/ImageBoot  ]; then
 				echo "NeoBoot hasn't been installed on: " $DEVICE
-				        umount $NEODEVICE > /dev/null 2>&1 
+				umount $NEO > /dev/null 2>&1 
 			else
 				echo "NEOBOOTt has been installed on: " $DEVICE
 				break;
 			fi 
 		done
-	            elif [ $mnttest="uuid" ]; then	
+	elif [ $mnttest == "uuid" ]; then	
 		echo "NEOBOOT mount by UUID"
 	fi
-###>>>>>>>>>>>>>>>>> 
+	if [ ! -e $IMAGEBOOT ]; then
-        HOSTNAME=`cat /etc/hostname`
-	if [ ! -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/boot/$HOSTNAME.vmlinux.gz ]; then
-
-            echo "Image launched on a base kernel flash. "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/kernel_flash
-
-	    MODPROBE=/sbin/modprobe
-
-	    echo "Load video and frame buffer modules ..."
-            modprobe dvb
-
-	    echo "NeoBoot is loading modules"
-	    for mod in dvb; do
-		    $MODPROBE $mod
-	    done
-	
-	    # Hack for loading modules which are not loaded on diffrent kernel images
-	    /etc/init.d/modutils.sh
-	    #
-
-	    echo "Set BOOTLOGO ..."
-            sleep 1	
-                         
-	    cat /etc/videomode > /proc/stb/video/videomode
-
-	    #we must wait until udev has created the video device
-	    (
-	    if [ -d /proc/stb ]; then
-		    while true; do
-			    if [ -e /dev/dvb/adapter0/video0 ]; then
-				    break;
-			    fi;
-		    done;
-	    fi;
-	    [ -e /etc/dropbear/dropbear_rsa_host_key ] && /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/neowait.mvi;
-	    ) &
-          
-            /etc/init.d/bootlogo > /dev/null 2>&1
-        
-            sleep 2
-            echo "Driverload end"
-
-	    if [ -f $LIBDIR/kernel/fs/autofs4/autofs4.ko ]; then
-		    /sbin/insmod $LIBDIR/kernel/fs/autofs4/autofs4.ko > /dev/null 2>&1
-	    fi
-
-	    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/fbclear > /dev/null 2>&1
-
-	fi 	
-
-        #dodatkowe szukanie neoboota
-        #mount /dev/sdb1 $NEO > /dev/null 2>&1  # <<< tu mozesz zmienic sdb1 i wpisac Twoje montowanie dysku dla neoboot
-
-	if [ -e /tmp/init_reboot ]; then
-		  break;
-	fi
-	
-        UPLOAD=ImagesUpload
-	if [ ! -e $NEODEVICE$IMAGEKATALOG ]; then
-                echo "Error mounting, Return to image Flash..."
-                sleep 2
 		  ln -sfn /sbin/init.sysvinit /sbin/init
-                echo "Flash "  > $NEODEVICE$IMAGEKATALOG/.neonextboot 
+                  echo "Flash "  > $IMAGEBOOT
-                echo "Reinstall kernel -Press number 3"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
+                  echo "Used Kernel: Reinstall kernel !"  > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel
-                echo " Sending all processes the TERM- KILL signal..."
 		  reboot -f
 	fi    
-          
-        #ln -sfn /sbin/init.sysvinit /sbin/init   #<<<<___after adding it will return to image flash
-
 	TARGET=Flash
-	if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then
+	if [ -f $IMAGEBOOT ]; then
-	  TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot`
+	  TARGET=`cat $IMAGEBOOT`
 	fi	
-	        
 	if [ $TARGET = "Flash" ]; then
 		echo "NEOBOOT is booting image from " $TARGET
+		/bin/umount $NEO > /dev/null 2>&1
 		/bin/umount /media/usb > /dev/null 2>&1
 		/bin/umount /media/hdd > /dev/null 2>&1
-		/usr/bin/showiframe /usr/share/bootlogo.mvi > /dev/null 2>&1
-		sync; ln -sfn /sbin/init.sysvinit /sbin/init#; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                echo "----------------------------------"
-	        echo "     BOOT UP IMAGE FROM FLASH     "
-                echo "----------------------------------"		
 	else
-                                                 
+		echo "NEOBOOT is booting" $TARGET " from " $DEVICE
-                ######### test boot new imaga>>>>                               
+                echo 3 > /proc/sys/vm/drop_caches
-                if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/.control_ok ]; then
+		if [ -d $NEO/ImageBoot/$TARGET ]; then
-	                        [ $PL ] && echo "Nie ma bledu, normalny start image..." || echo "No Error - Booting image normal..."
+			if [ -f $NEO/ImageBoot/$TARGET/etc/init.d/udev ]; then
-                else 
+				sed -ie s!"\$4"!"\$3"!g $NEO/ImageBoot/$TARGET/etc/init.d/udev
-          			if [ -e $NEODEVICE$IMAGEKATALOG/$TARGET/.control_boot_new_image ]; then
-                    			echo "First start image - The first attempt to launch a new image... "; rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/.control_boot_new_image 
-          			else    
-              			        echo "Wrong kernel. Press number 3"  > $NEODEVICE$UPLOAD/.kernel/used_flash_kernel
-                    			ln -sfn /sbin/init.sysvinit /sbin/init
-                    			echo "Flash "  > $NEODEVICE$IMAGEKATALOG/.neonextboot
-                    			echo "Error - NeoBoot he can not run it image !!! "
-                    			echo "Restart STB - Back to Flash... "
-                                        echo "NeoBoot is booting" $TARGET                     			
-                    			sleep 5; reboot -f   
 			fi
-                fi
-                ######### test boot new image<<<<<                
-                                                                
-		echo "NeoBoot is booting" $TARGET " from " `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`
-		
-                if [ -d $NEODEVICE$IMAGEKATALOG/$TARGET ]; then
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev ]; then
-				sed -ie s!"\$4"!"\$3"!g $NEODEVICE$IMAGEKATALOG/$TARGET/etc/init.d/udev
-			fi
-
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi ]; then
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			else
-				/usr/bin/showiframe $NEODEVICE$IMAGEKATALOG/$TARGET/usr/share/bootlogo.mvi
-			fi
-
                 	sleep 1		
-                       			
+			/bin/mount -o bind /dev $NEO/ImageBoot/$TARGET/dev
-			/bin/mount -o bind /dev $NEODEVICE$IMAGEKATALOG/$TARGET/dev
+			/bin/mount -o bind /proc $NEO/ImageBoot/$TARGET/proc
-			/bin/mount -o bind /proc $NEODEVICE$IMAGEKATALOG/$TARGET/proc
+			/bin/mount -o bind /sys $NEO/ImageBoot/$TARGET/sys
-			/bin/mount -o bind /sys $NEODEVICE$IMAGEKATALOG/$TARGET/sys
+			rm $NEO/ImageBoot/$TARGET$NEO > /dev/null 2>&1
-                        			
+			mkdir $NEO/ImageBoot/$TARGET$NEO > /dev/null 2>&1
-			rm $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-			mkdir $NEODEVICE$IMAGEKATALOG/$TARGET$NEODEVICE > /dev/null 2>&1
-                     
-			if [ -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ]; then
-				rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh > /dev/null 2>&1
-			fi
-                                                    
                         orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
+                        rm -f $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
                            for item in $orgimag; do
                                ohdd=`echo  $item | cut -d"/" -f3`
                                nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                   if [ $nhdd == '`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`' ]; then
+                               if [ $nhdd == '$NEO' ]; then
                                   echo $nhdd
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                  echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                  echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
                                else
-                                      echo "umount "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                  echo "umount "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mkdir "$nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh
+                                  echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
-                                      echo "mount "$item $nhdd  >> $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                  echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
                                   echo ok 
                                fi    
                            done	
-                       	if [ ! -e $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh ]; then
+                        chmod 755 $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh   
-                            cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh 
-                       	fi
-                        chmod 755 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh                                                                        
-                        echo "NeoBOOT created the file mount enigma2_pre_start.sh " 
 
-                        echo " [NEOBOOT] Use chroot ... exec /usr/sbin/chroot..."
+			if [ -f $IMAGE/$TARGET/sbin/init.sysvinit ]; then                                    
-                                                                      
+                                    exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init.sysvinit 
-			if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init.sysvinit ]; then   
+			elif [ -f $IMAGE/$TARGET/sbin/init ]; then                                    
-                                    echo "----------------------------------------"
+                                    exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init        
-	                            echo "   -=*[ BOOT UP IMAGE FROM DISK ]*=-    "
-                                    echo "----------------------------------------"                                                                                                                     
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init.sysvinit
-			elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init ]; then                                    
-                                    exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init        
 			else
                                     echo " "
                                     echo "                       NEOBOOT - ERROR !!!                                 "
-                                    echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE
+                                    echo "Nie odnaleziono poprawnie rozpakowanego image "$TARGET" z partycji " $DEVICE
-                                    echo "Check the correctness of unpacked catalogs in the selected one image.      "
+                                    echo " Sprawdz poprawnosc rozpakowanych katalogow w wybranym image.              "
-                                    echo "                      Back to image Flash...                             "                                                                    
+                                    echo "                      Powrot do image Flash...                             "
-                                    /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1
+                                    rm -f $IMAGEBOOT; touch $IMAGEBOOT; echo "Flash "  >> $IMAGEBOOT 
-                                    sync; ln -sfn /sbin/init.sysvinit /sbin/init
+                                    sync; sleep 10; exec /sbin/init.sysvinit $1
-                                    echo "Flash "  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot
-                                    echo "Used Kernel: Reinstall kernel !"  > `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$UPLOAD/.kernel/used_flash_kernel
-                                    sleep 15; reboot -f
-
 			fi
 			exit 0
 		fi
 	fi
 fi
-
-# boot Flash 
-
 if [ -f /sbin/init.sysvinit ]; then
-		#echo "Running /sbin/init.sysvinit"
 		exec /sbin/init.sysvinit $1
 fi
 
 exit 0
-;;
-esac
-exit

NeoBoot/bin/utilsbh

@@ -1,189 +0,0 @@
-from re import sub
-from Tools.Directories import fileExists, resolveFilename, SCOPE_CURRENT_SKIN
-import xml.etree.cElementTree
-entities = [('ä', u'\xe4'),
- ('ä', u'\xe4'),
- ('ü', u'\xfc'),
- ('ü', u'\xfc'),
- ('ö', u'\xf6'),
- ('ö', u'\xf6'),
- ('Ä', u'\xc4'),
- ('Ä', u'\xc4'),
- ('Ü', u'\xdc'),
- ('Ü', u'\xdc'),
- ('Ö', u'\xd6'),
- ('Ö', u'\xd6'),
- ('ß', u'\xdf'),
- ('ß', u'\xdf'),
- ('…', u'...'),
- ('–', u'-'),
- (' ', u' '),
- ('"', u'"'),
- ('&', u'&'),
- (''', u"'"),
- ('&#60;', u'<'),
- ('&#62;', u'>'),
- ('&lt;', u'<'),
- ('&gt;', u'>'),
- ('&nbsp;', u' '),
- ('&amp;', u'&'),
- ('&quot;', u'"'),
- ('&apos;', u"'")]
-
-def nab_strip_html(html):
-    html = html.replace('\n', ' ')
-    html = sub('\\s\\s+', ' ', html)
-    html = sub('<br(\\s+/)?>', '\n', html)
-    html = sub('</?(p|ul|ol)(\\s+.*?)?>', '\n', html)
-    html = sub('<li(\\s+.*?)?>', '-', html)
-    html = html.replace('</li>', '\n')
-    return nab_strip_pass1(html)
-
-
-def nab_strip_pass1(html):
-    html = sub('<(.*?)>', '', html)
-    html.replace('&#196;', '\xc3\x84')
-    html.replace('&#228;', '\xc3\xa4')
-    html.replace('&auml;', '\xc3\xa4')
-    html.replace('&#252;', '\xc3\xbc')
-    html.replace('&uuml;', '\xc3\xbc')
-    html.replace('&#246;', '\xc3\xb6')
-    html.replace('&ouml;', '\xc3\xb6')
-    html.replace('&#196;', '\xc3\x84')
-    html.replace('&Auml;', '\xc3\x84')
-    html.replace('&#220;', '\xc3\x9c')
-    html.replace('&Uuml;', '\xc3\x9c')
-    html.replace('&#214;', '\xc3\x96')
-    html.replace('&Ouml;', '\xc3\x96')
-    html.replace('&#223;', '\xc3\x9f')
-    html.replace('&szlig;', '\xc3\x9f')
-    html.replace('&lt;', '<')
-    html.replace('&gt;', '>')
-    html.replace('&nbsp;', ' ')
-    html.replace('&amp;', '&')
-    html.replace('&quot;', '"')
-    html.replace('&apos;', "'")
-    return html
-
-
-def nab_Read_CCCinfoCfg():
-    myhost = '127.0.0.1'
-    myuser = mypass = ''
-    myport = '16001'
-    if fileExists('/etc/delcccaminfo'):
-        f = open('/etc/delcccaminfo', 'r')
-        for line in f.readlines():
-            line = line.strip()
-            if line.find('HOST ADDRESS:') != -1:
-                myhost = line[13:]
-            elif line.find('WEBINFO USERNAME:') != -1:
-                myuser = line[17:]
-            elif line.find('WEBINFO PASSWORD:') != -1:
-                mypass = line[17:]
-            elif line.find('WEBINFO LISTEN PORT:') != -1:
-                myport = line[20:]
-
-        f.close()
-    myurl = 'http://' + myhost + ':' + myport
-    if myuser and mypass:
-        myurl = 'http://' + myuser + ':' + mypass + '@' + myhost + ':' + myport
-    return [myhost,
-     myuser,
-     mypass,
-     myport,
-     myurl]
-
-
-def nab_Write_CCCinfoCfg(mycfg):
-    out = open('/etc/delcccaminfo', 'w')
-    strview = 'HOST ADDRESS:' + mycfg[0] + '\n'
-    out.write(strview)
-    strview = 'WEBINFO USERNAME:' + mycfg[1] + '\n'
-    out.write(strview)
-    strview = 'WEBINFO PASSWORD:' + mycfg[2] + '\n'
-    out.write(strview)
-    strview = 'WEBINFO LISTEN PORT:' + mycfg[3] + '\n'
-    out.write(strview)
-    out.close()
-
-
-def DeliteGetSkinPath():
-    myskinpath = resolveFilename(SCOPE_CURRENT_SKIN, '')
-    if myskinpath == '/usr/share/enigma2/':
-        myskinpath = '/usr/share/enigma2/skin_default/'
-    return myskinpath
-
-
-def nab_Detect_Machine():
-    machine = 'dm8000'
-    if fileExists('/etc/bhmachine'):
-        f = open('/etc/bhmachine', 'r')
-        machine = f.readline().strip()
-        f.close()
-    return machine
-
-
-def BhU_get_Version():
-    ver = ''
-    if fileExists('/boot/blackhole/version'):
-        f = open('/boot/blackhole/version', 'r')
-        ver = f.readline().strip()
-        f.close()
-    return ver
-
-
-def BhU_check_proc_version():
-    ver = ''
-    if fileExists('/boot/blackhole/version'):
-        f = open('/boot/blackhole/version', 'r')
-        ver = f.readline().strip()
-        f.close()
-    return ver
-
-
-def BhU_checkSkinVersion(skinfile):
-    version = '2.0.0'
-    authors = ['Army', 'Matrix10', 'capa']
-    ret = 'Sorry this skin is not compatible with the current Black Hole image version.'
-    curversion = int(version.replace('.', ''))
-    fullfile = '/usr/share/enigma2/' + skinfile
-    checkver = False
-    checkauth = False
-    if fileExists(fullfile):
-        f = open(fullfile)
-        for line in f.readlines():
-            if line.find('black hole version:') != -1:
-                parts = line.strip().split(':')
-                ver = int(parts[1].strip().replace('.', ''))
-                if ver >= curversion:
-                    checkver = True
-            elif line.find('skin author:') != -1:
-                parts = line.strip().split(':')
-                auth = parts[1].strip()
-                for a in authors:
-                    if a == auth:
-                        checkauth = True
-
-        f.close()
-    if checkver == True:
-        if checkauth == True:
-            ret = 'passed'
-    return ret
-
-
-def BhU_find_hdd():
-    hdd = ''
-    hdds = ['sda',
-     'sdb',
-     'sdc',
-     'sdd',
-     'sde',
-     'sdf']
-    for device in hdds:
-        filename = '/sys/block/%s/removable' % device
-        if fileExists(filename):
-            if file(filename).read().strip() == '0':
-                hdd = device
-                break
-
-    return hdd

NeoBoot/bin/version

@@ -1 +0,0 @@
-1.4.1

NeoBoot/ex_init.py

@@ -1,6 +1,6 @@
                                                                                                                                                        
 import sys, extract
-if len(sys.argv) < 15:
+if len(sys.argv) < 14:
     pass
 else:
-    extract.NEOBootMainEx(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11], sys.argv[12], sys.argv[13], sys.argv[14], sys.argv[15])       
+    extract.NEOBootMainEx(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10], sys.argv[11], sys.argv[12], sys.argv[13] , sys.argv[14])       

NeoBoot/extract.py

@@ -1,7 +1,11 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
+import sys
+import os
+import struct
+import shutil
+
 # ver. gutosie
-import time, sys, os, struct, shutil 
 
 def LanguageUsed():
     language = ''
@@ -71,7 +75,7 @@ mediahome = media + '/ImageBoot/'
 extensions_path = '/usr/lib/enigma2/python/Plugins/Extensions/'
 dev_null = ' > /dev/null 2>&1'
 
-def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Montowanie, LanWlan, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole):
+def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, LanWlan, Sterowniki, InstallSettings, ZipDelete, RepairFTP, SoftCam, MediaPortal, BlackHole):
     media_target = mediahome + target
     list_one = ['rm -r ' + media_target + dev_null, 'mkdir ' + media_target + dev_null, 'chmod -R 0777 ' + media_target]
     for command in list_one:
@@ -82,6 +86,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
         os.system('touch /tmp/init4; init 4')
 
     rc = NEOBootExtract(source, target, ZipDelete, BlackHole)    
+
     if not os.path.exists('%s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions' % (media, target)):
         os.system('mkdir -p %s/ImageBoot/%s/usr/lib/' % (media, target))
         os.system('mkdir -p %s/ImageBoot/%s/usr/lib/enigma2' % (media, target))
@@ -89,13 +94,15 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
         os.system('mkdir -p %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins' % (media, target))
         os.system('mkdir -p %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions' % (media, target))
 
+    if os.path.exists('%s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' % (media, target)):
+        os.system('rm -r %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot' % (media, target))
+
     list_two = ['mkdir -p ' + media_target + '/media' + dev_null,
      'rm ' + media_target + media + dev_null,
      'rmdir ' + media_target + media + dev_null,
      'mkdir -p ' + media_target + media + dev_null,
      #'cp /etc/passwd ' + media_target + '/etc/passwd' + dev_null,
      'cp /etc/hostname ' + media_target + '/etc/hostname' + dev_null,              
-     #'cp -rf /etc/init.d/vuplus-platform-util ' + media_target + '/etc/init.d/vuplus-platform-util' + dev_null,       
      'cp -rf ' + extensions_path + 'NeoBoot ' + media_target + extensions_path + 'NeoBoot' + dev_null]
     for command in list_two:
         os.system(command)
@@ -121,65 +128,65 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 rc = os.system(cmd)
                 cmd = 'cp -r /lib/firmware %s/ImageBoot/%s/lib > /dev/null 2>&1' % (media, target)
                 rc = os.system(cmd)
-                os.system('echo "Skopiowano sterowniki systemu. Nie skopiowano kernel.bin dla Ultimo HD - NIE ZALECANE DLA TEGO MODELU."')
+                os.system('echo "Copied system drivers. Not recommended copied kernel.bin for Ultimo HD."')
                           
             elif getBoxHostName() == 'vuultimo' or getCPUSoC() == '7335' or getCPUSoC() == '7325' or getCPUSoC() == '7405' or getCPUSoC() == '7356' or getCPUSoC() == '7424' or getCPUSoC() == '7241' or getCPUSoC() == '7362':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/vuplus/' + getBoxVuModel() + '/kernel_cfe_auto.bin ' + media_target + '/boot/' + getBoxHostName() + '.vmlinux.gz' + dev_null)        
-                os.system('echo "Skopiowano kernel.bin STB-MIPS"')
+                os.system('echo "Copied kernel.bin STB-MIPS"')
 
 #Ultra
             elif getBoxHostName() == 'mbultra' or getCPUSoC() == 'bcm7424':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/miraclebox/ultra/kernel.bin ' + media_target + '/boot/' + getBoxHostName() + '.vmlinux.gz' + dev_null)        
-                os.system('echo "Skopiowano kernel.bin MiracleBoxUltra. Typ stb - MIPS"')
+                os.system('echo "Copied kernel.bin MiracleBoxUltra. Typ stb - MIPS"')
 
 #Edision OS MINI 
             elif getBoxHostName() == 'osmini' or getCPUSoC() == 'BCM7362':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/osmini/kernel.bin ' + media_target + '/boot/' + getBoxHostName() + '.vmlinux.gz' + dev_null)        
-                os.system('echo "Skopiowano kernel.bin Edision OS MINI. Typ stb - MIPS"')
+                os.system('echo "Copied kernel.bin Edision OS MINI. Typ stb - MIPS"')
 #arm octagon
             elif getBoxHostName() == 'sf4008':  #getCPUSoC() == 'bcm7251' or
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM Octagon."')   
+                os.system('echo "Copied kernel.bin STB-ARM Octagon."')   
 
 #arm /uclan/ustym4kpro
             elif getCPUSoC() == '3798mv200' or getBoxHostName() == 'ustym4kpro':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/uclan/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM uclan ustym4kpro."')   
+                os.system('echo "Copied kernel.bin STB-ARM uclan ustym4kpro."')   
 
 
 #arm Galaxy Innvations ET-11000 4K et1x000
             elif getBoxHostName() == 'et1x000': #getCPUSoC() == 'bcm7251' or
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM GI ET-11000 4K."')
+                os.system('echo "Copied kernel.bin STB-ARM GI ET-11000 4K."')
 
 #arm Dreambox dm920
             elif getBoxHostName() == 'dm920': 
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM DM920 4K."')
+                os.system('echo "Copied kernel.bin STB-ARM DM920 4K."')
 
 #arm Dreambox dm920
             elif getBoxHostName() == 'ax51': 
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/hd51/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM AX 4K Box HD51 4K."')
+                os.system('echo "Copied kernel.bin STB-ARM AX 4K Box HD51 4K."')
 
 #arm  Ariva 4K Combo
             elif getBoxHostName() == 'arivatwin': #getCPUSoC() == 'bcm7251' or
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/e2/update/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM Ariva 4K Combo."')
+                os.system('echo "Copied kernel.bin STB-ARM Ariva 4K Combo."')
 
 #arm Zgemma h7
             elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/zgemma/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM Zgemma h7."')   
+                os.system('echo "Copied kernel.bin STB-ARM Zgemma h7."')   
 #arm gbquad4k
             elif getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/gigablue/quad4k' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM gbquad4k."')                 
+                os.system('echo "Copied kernel.bin STB-ARM gbquad4k."')                 
                          
 #arm vuplus
             elif getCPUSoC() == '7444s' or getCPUSoC() == '7278' or getCPUSoC() == '7376' or getCPUSoC() == '7252s' or getCPUSoC() == '72604':
                 os.system('mv ' + getNeoLocation() + 'ImagesUpload/vuplus/' + getBoxVuModel() + '/kernel_auto.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null)
-                os.system('echo "Skopiowano kernel.bin STB-ARM"')   
+                os.system('echo "Copied kernel.bin STB-ARM"')   
                                             
     if not os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):           
         if os.path.exists('/usr/sbin/nandwrite'):
@@ -200,44 +207,27 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
         if os.path.exists('/usr/lib/enigma2/python/Plugins/SystemPlugins/FanControl'):
             cmd = 'cp -r /usr/lib/enigma2/python/Plugins/SystemPlugins/FanControl %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/SystemPlugins > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/EmuManager'):
+        if os.path.exists('' + extensions_path + 'EmuManager'):
-            cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/EmuManager %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+            cmd = 'cp -r ' + extensions_path + 'EmuManager %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/CamdMenager'):
+        if os.path.exists('' + extensions_path + 'CamdMenager'):
-            cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/CamdMenager %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+            cmd = 'cp -r ' + extensions_path + 'CamdMenager %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/IPTVPlayer'):
+        if os.path.exists('' + extensions_path + 'IPTVPlayer'):
-            cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/IPTVPlayer %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+            cmd = 'cp -r ' + extensions_path + 'IPTVPlayer %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
             cmd = 'cp /usr/lib/python*.*/htmlentitydefs.pyo %s/ImageBoot/%s/usr/lib/python*.* > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/FeedExtra'):
+        if os.path.exists('' + extensions_path + 'FeedExtra'):
-            cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/FeedExtra %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+            cmd = 'cp -r ' + extensions_path + 'FeedExtra %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MyUpdater'):
+        if os.path.exists('' + extensions_path + 'MyUpdater'):
-            cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/MyUpdater %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+            cmd = 'cp -r ' + extensions_path + 'MyUpdater %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
         if not os.path.exists('%s/ImageBoot/%s/usr/lib/enigma2/python/boxbranding.so' % (media, target)):
             cmd = 'cp -r /usr/lib/enigma2/python/boxbranding.so %s/ImageBoot/%s/usr/lib/enigma2/python/boxbranding.so > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-        os.system('echo "Skopiowano wtyczki."')        
+        os.system('echo "Copied plugins..."')        
-        
-
-        if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
-            cmd = 'mkdir -p %s/ImageBoot/%s/etc/enigma2' % (media, target)
-            rc = os.system(cmd)
-            cmd = 'touch %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
-            rc = os.system(cmd)
-        cmd = 'grep "config.Nims" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
-        rc = os.system(cmd)
-        cmd = 'grep "config.OpenWebif" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
-        rc = os.system(cmd)
-        cmd = 'grep "config.osd" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
-        rc = os.system(cmd)
-        cmd = 'grep "config.timezone" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
-        rc = os.system(cmd)
-        cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh %s/ImageBoot/%s/etc/rcS.d' % (media, target)
-        rc = os.system(cmd)
         
         if TvList == 'True':
             if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
@@ -251,48 +241,15 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
             rc = os.system(cmd)
             cmd = 'cp /etc/enigma2/lamedb %s/ImageBoot/%s/etc/enigma2' % (media, target)
             rc = os.system(cmd)
-            os.system('echo "Skopiowano list\xc4\x99 tv."')
+            os.system('echo "Copied TV list..."')
-
-        if Montowanie == 'True':                
-            cmd = 'grep "UUID=" /etc/fstab >> %s/ImageBoot/%s/etc/fstab' % (media, target)
-            rc = os.system(cmd)
-            if os.path.exists('%s/ImageBoot/%s/etc/init.d/udev' % (media, target)):
-                filename = '%s/ImageBoot/%s/etc/init.d/udev' % (media, target)
-                if os.path.exists(filename):
-                    filename2 = filename + '.tmp'
-                    out = open(filename2, 'w')
-                    f = open(filename, 'r')
-                    for line in f.readlines():
-                        if line.find('exit 0') != -1:
-                            line = '\n'
-                        out.write(line)
-
-                    f.close()
-                    out.close()
-                    os.rename(filename2, filename)
-
-                    cmd = 'echo "mount -a /media/hdd; mount -a /media/usb" >> %s/ImageBoot/%s/etc/init.d/udev' % (media, target)
-                    rc = os.system(cmd)
-                    cmd = 'echo "exit 0" >> %s/ImageBoot/%s/etc/init.d/udev' % (media, target)
-                    rc = os.system(cmd)
-                    cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/udev' % (media, target)
-                    rc = os.system(cmd)
-                    
-            if os.path.exists('%s/ImageBoot/%s/etc/init.d/mdev'% (media, target)):                    
-                    cmd = 'echo " " >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
-                    rc = os.system(cmd)
-                    cmd = 'echo "mount -a /media/hdd; mount -a /media/usb" >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
-                    rc = os.system(cmd)
-                    cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
-                    rc = os.system(cmd)
 
         if LanWlan == 'True':
             if os.path.exists('%s/ImageBoot/%s/etc/vtiversion.info' % (media, target)):
-                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+                os.system('echo "Not copied LAN-WLAN, not recommended for this image."')
             elif os.path.exists('/etc/vtiversion.info') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)):
-                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+                os.system('echo "Not copied LAN-WLAN, not recommended for this image."')
             elif os.path.exists('/etc/bhversion') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)):
-                os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."')
+                os.system('echo "Not copied LAN-WLAN, not recommended for this image."')
             else:                
                 if os.path.exists('/etc/wpa_supplicant.wlan0.conf'):
                     cmd = 'cp -Rpf /etc/wpa_supplicant.wlan0.conf %s/ImageBoot/%s/etc/wpa_supplicant.wlan0.conf > /dev/null 2>&1' % (media, target)
@@ -309,6 +266,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 if os.path.exists('/etc/wl.conf.wlan3'):
                     cmd = 'cp -r /etc/wl.conf.wlan3 %s/ImageBoot/%s/etc/wl.conf.wlan3 > /dev/null 2>&1' % (media, target)
                     rc = os.system(cmd)
+            os.system('echo "Copied LAN-WLAN..."')
 
         if Sterowniki == 'True':
             if os.path.exists('%s/ImageBoot/%s/lib/modules' % (media, target)):
@@ -325,7 +283,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
             rc = os.system(cmd)
             cmd = 'cp -r /lib/firmware %s/ImageBoot/%s/lib > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
-            os.system('echo "Skopiowano sterowniki systemu."')
+            os.system('echo "System drivers copied..."')
 
         if InstallSettings == 'True':
             if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
@@ -340,7 +298,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 rc = os.system(cmd)
             cmd = 'cp -a /etc/tuxbox/* %s/ImageBoot/%s/etc/tuxbox' % (media, target)
             rc = os.system(cmd)
-            os.system('echo "Skopiowano ustawienia systemu."')
+            os.system('echo "System settings copied..."')
 
         if RepairFTP == 'True':
             if os.path.exists('%s/ImageBoot/%s/etc/vsftpd.conf' % (media, target)):
@@ -359,30 +317,22 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                     f.close()
                     out.close()
                     os.rename(filename2, filename)
-            os.system('echo "Naprawa ftp."')
+            os.system('echo "Repair ftp."')
 
         if SoftCam == 'True':
             if os.path.exists('/etc/CCcam.cfg'):
-                cmd = 'cp -r -f /etc/CCcam.cfg %s/ImageBoot/%s/etc > /dev/null 2>&1' % (media, target)    
+                cmd = 'cp -r /etc/CCcam.cfg %s/ImageBoot/%s/etc > /dev/null 2>&1' % (media, target)    
                 rc = os.system(cmd)                                                                                                                                 
             if os.path.exists('/etc/tuxbox/config'):
-                cmd = 'cp -r -f /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target)
+                cmd = 'cp -r /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target)
-                rc = os.system(cmd)       
-            if os.path.exists('/etc/init.d/softcam.oscam'):
-                cmd = 'cp -r -f -p /etc/init.d/softcam.osca* %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
-                rc = os.system(cmd) 
-            if os.path.exists('/etc/init.d/softcam.None'):
-                cmd = 'cp -r -f -p /etc/init.d/softcam.None %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
-                rc = os.system(cmd) 
-            if os.path.exists('/etc/init.d/softcam.CCcam'):
-                cmd = 'cp -r -f -p /etc/init.d/softcam.softcam.CCcam %s/ImageBoot/%s/etc/init.d > /dev/null 2>&1' % (media, target)
                 rc = os.system(cmd)                      
+            os.system('echo "Copied softcam files to the installed image..."')
 
         if MediaPortal == 'True':
-            if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal'):
+            if os.path.exists('' + extensions_path + 'MediaPortal'):
-                cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/MediaPortal %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+                cmd = 'cp -r ' + extensions_path + 'MediaPortal %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
                 rc = os.system(cmd)            
-                cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/mpgz %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
+                cmd = 'cp -r ' + extensions_path + 'mpgz %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions > /dev/null 2>&1' % (media, target)
                 rc = os.system(cmd) 
                 cmd = 'cp -r /usr/lib/python2.7/argparse.pyo %s/ImageBoot/%s/usr/lib/python2.7 > /dev/null 2>&1' % (media, target)
                 rc = os.system(cmd) 
@@ -400,20 +350,42 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
                     cmd = 'mkdir -p %s/ImageBoot/%s/etc/enigma2' % (media, target)
                     rc = os.system(cmd)
+                if os.path.exists('/etc/enigma2/mp_2s4p'):
                     cmd = 'cp /etc/enigma2/mp_2s4p %s/ImageBoot/%s/etc/enigma2' % (media, target)
                     rc = os.system(cmd)
+                if os.path.exists('/etc/enigma2/mp_config'):
                     cmd = 'cp /etc/enigma2/mp_config %s/ImageBoot/%s/etc/enigma2' % (media, target)
                     rc = os.system(cmd)
+                if os.path.exists('/etc/enigma2/mp_pluginliste'):
                     cmd = 'cp /etc/enigma2/mp_pluginliste %s/ImageBoot/%s/etc/enigma2' % (media, target)
                     rc = os.system(cmd)                                
-                os.system('echo "Skopiowano MediaPortal z ustawieniami systemowymi."')
+                os.system('echo "Copied MediaPortal..."')
-            elif not os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal'):                    
+            elif not os.path.exists('' + extensions_path + 'MediaPortal'):                    
                 os.system('echo "MediaPortal not found."')
 
 # for all image:
-    if not os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):         
+
-        if os.path.exists('%s/ImageBoot/%s/etc/init.d/udev' % (media, target)):
+        if os.path.exists('%s/ImageBoot/%s/etc/rc.local' % (media, target)):
-                filename = '%s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target)
+                filename = '%s/ImageBoot/%s/etc/rc.local' % (media, target)
+                if os.path.exists(filename):
+                    filename2 = filename + '.tmp'
+                    out = open(filename2, 'w')
+                    f = open(filename, 'r')
+                    for line in f.readlines():
+                        if line.find('exit 0') != -1:
+                            line = '\n'
+                        out.write(line)
+
+                    f.close()
+                    out.close()
+                    os.rename(filename2, filename)
+                cmd = 'echo -n "\n\n/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh \n\nexit 0" >> %s/ImageBoot/%s/etc/rc.local' % (media, target)
+                rc = os.system(cmd)
+                cmd = 'chmod 0755 %s/ImageBoot/%s/etc/rc.local' % (media, target)
+                rc = os.system(cmd) 
+
+        if os.path.exists('%s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)):
+                filename = '%s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)
                 if os.path.exists(filename):
                     filename2 = filename + '.tmp'
                     out = open(filename2, 'w')
@@ -427,20 +399,55 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                     out.close()
                     os.rename(filename2, filename)
 
-                    cmd = 'echo "/etc/init.d/networking stop; /etc/init.d/networking start;" >> %s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target)
+                cmd = 'echo -n "\n\n/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh \n\nexit 0" >> %s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)
                 rc = os.system(cmd)
-                    cmd = 'echo "exit 0" >> %s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target)
+                cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)
-                    rc = os.system(cmd)
-                    cmd = 'chmod 755 %s/ImageBoot/%s/etc/init.d/bootmisc.sh' % (media, target)
                 rc = os.system(cmd)
 
+        if not os.path.exists('%s/ImageBoot/%s/etc/init.d/rc.local' % (media, target)) and not os.path.exists('%s/ImageBoot/%s/etc/rc.local' % (media, target)) :  
+            if os.path.exists('%s/ImageBoot/%s/etc/init.d' % (media, target)):                  
+#                cmd = 'ln -s %sImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh %sImageBoot/%s/etc/rcS.d/S99neo.local' % (media,
+#                 target,                 
+#                 media,
+#                 target)
+                cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh %sImageBoot/%s/etc/rcS.d/S99neo.local' % (media, target)
+                rc = os.system(cmd)
+                cmd = 'chmod 0755 %s/ImageBoot/%s/etc/rcS.d/S99neo.local' % (media, target)
+                rc = os.system(cmd)
+            elif not os.path.exists('%s/ImageBoot/%s/etc/init.d' % (media, target)):
+                os.system('echo "/etc/init.d not found."')
+            os.system('echo "Copied file neo_userscript.sh"')
+
+    if not os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):         
+        if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
+                cmd = 'mkdir -p %s/ImageBoot/%s/etc/enigma2' % (media, target)
+                rc = os.system(cmd)
+                cmd = 'touch %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+                rc = os.system(cmd)
+        cmd = 'grep "config.Nims" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)        
+        cmd = 'grep "av.videomode.DVI" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)               
+        cmd = 'grep "config.OpenWebif" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)
+        cmd = 'grep "config.osd" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)
+        cmd = 'grep "config.timezone.val" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)
+        cmd = 'grep "config.servicelist.startuproot" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
+        rc = os.system(cmd)                
+        cmd = 'grep "UUID=" /etc/fstab >> %s/ImageBoot/%s/etc/fstab' % (media, target)
+        rc = os.system(cmd)
+
+
+#####################################
+        if not os.path.exists('' + media_target + '/boot/zImage.' + getBoxHostName() + ''):
             namefile = media + '/ImageBoot/' + target + '/etc/fstab'
             namefile2 = namefile + '.tmp'
             if os.path.exists(namefile2):
                 out = open(namefile2, 'w')
                 f = open(namefile, 'r')
                 for line in f.readlines():
-
                     if line.find('/dev/mmcblk0p1') != -1:
                         line = '#' + line
                     elif line.find('/dev/mmcblk0p2') != -1:
@@ -505,7 +512,6 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 out.close()
                 os.rename(fname2, fname)
 
-
             targetfile = media + '/ImageBoot/' + target + '/etc/vsftpd.conf'
             if os.path.exists(targetfile):
                 targetfile2 = targetfile + '.tmp'
@@ -519,7 +525,6 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
                 out.close()
                 os.rename(targetfile2, targetfile)
 
-
             mypath = media + '/ImageBoot/' + target + '/usr/lib/opkg/info/'
             cmd = 'mkdir -p %s/ImageBoot/%s/var/lib/opkg/info > /dev/null 2>&1' % (media, target)
             rc = os.system(cmd)
@@ -618,8 +623,8 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
     out.write('Flash')
     out.close()                                                                             
     if '.tar.xz' not in source and not os.path.exists('' + getNeoLocation() + '/ImageBoot/%s/etc/issue' %  target):
-            os.system('echo ""; echo "Nie zainstalowano systemu ! Powodem b\xc5\x82\xc4\x99du instalacji mo\xc5\xbce by\xc4\x87 \xc5\xbale spakowany plik image w zip lub nie jest to sytem dla Twojego modelu ."')
+            os.system('echo ""; echo "No system installed! The reason for the installation error may be badly packed image files or it is not a system for your model."')
-            os.system('echo "Instalowany system może sieę nie uruchomić poprawnie! Sprawdż poprawność kataogow w instalwoanym image!!!"')
+            os.system('echo "The installed system may not start. Check the correctness of the installed image directory!!!"')
             os.system('rm -r ' + getNeoLocation() + '/ImageBoot/%s' % target )
 
     if os.path.exists('' + getNeoLocation() + 'ubi'):
@@ -634,6 +639,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Mon
         os.system('rm -f /tmp/init4; init 3')
 
     os.system('echo "End of installation:"; date +%T')
+    os.system('echo "If you want to save the installation process from the console press green."')    
 
 def RemoveUnpackDirs():
     os.chdir(media + '/ImagesUpload')
@@ -643,6 +649,8 @@ def RemoveUnpackDirs():
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/sf4008')
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/osmio4k'):
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/osmio4k')  
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/osmio4kplus'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/osmio4kplus')                               
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm900'):
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/dm900')
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd51'):
@@ -679,8 +687,12 @@ def RemoveUnpackDirs():
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/e2')                                                                                          
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et1x000'):
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/et1x000') 
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/protek4k'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/protek4k')                
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm920 '):
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/dm920 ')                              
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/multibox'):          
+        rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/unforce_multibox ' + getNeoLocation() + 'ImagesUpload/multibox; rm -r ' + getNeoLocation() + 'ImagesUpload/multibox')                                          
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/octagon/sf8008'):          
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/octagon; rm -r ' + getNeoLocation() + 'ImagesUpload/octagon')                                          
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd60'):          
@@ -691,7 +703,14 @@ def RemoveUnpackDirs():
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h9'):
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/bootargs.bin ' + getNeoLocation() + 'ImagesUpload/h9; mv ' + getNeoLocation() + 'ImagesUpload/fastboot.bin ' + getNeoLocation() + 'ImagesUpload/h9')                                                                                                
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h9')                      
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h9combo'):
+        rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h9combo_READ.ME ' + getNeoLocation() + 'ImagesUpload/h9combo; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h9combo.txt ' + getNeoLocation() + 'ImagesUpload/h9combo')                                                                                                
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h9combo')  
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h10'):
+        rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/force_h10_READ.ME ' + getNeoLocation() + 'ImagesUpload/h10; mv ' + getNeoLocation() + 'ImagesUpload/unforce_h10.txt ' + getNeoLocation() + 'ImagesUpload/h10')                                                                                                
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/h10')  
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/uclan'):
+        if os.path.exists('' + getNeoLocation() + 'ImagesUpload/usb_update.bin'):    
             rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/usb_update.bin ' + getNeoLocation() + 'ImagesUpload/uclan') 
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/uclan') 
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz'):
@@ -717,10 +736,20 @@ def RemoveUnpackDirs():
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/bootargs.bin ' + getNeoLocation() + 'ImagesUpload/gigablue') 
         rc = os.system('mv ' + getNeoLocation() + 'ImagesUpload/fastboot.bin ' + getNeoLocation() + 'ImagesUpload/gigablue')  
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/gigablue')                
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz'):
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz')        
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2')
+    elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et10000') :
+        rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/et10000')
+
+
  
 def NEOBootExtract(source, target, ZipDelete, BlackHole):
     RemoveUnpackDirs()
-    os.system('echo "Installation started:"; date +%T;echo "Extracting the installation file..."')
+    os.system('echo "Press green to hide Console or red to abort the installation\nInstallation started:"; date +%T;echo "Extracting the installation file..."')
 
     if os.path.exists('' + getNeoLocation() + 'ImageBoot/.without_copying'):
         os.system('rm -f ' + getNeoLocation() + 'ImageBoot/.without_copying') 
@@ -740,7 +769,7 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             to = '' + getNeoLocation() + 'ImageBoot/' + target
             cmd = 'chmod -R 0777 %s' % to
             rc = os.system(cmd)
-            cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/nfidump ' + sourcefile2 + ' ' + getNeoLocation() + 'ImageBoot/' + target
+            cmd = '' + extensions_path + 'NeoBoot/bin/nfidump ' + sourcefile2 + ' ' + getNeoLocation() + 'ImageBoot/' + target
             rc = os.system(cmd)
             if ZipDelete == 'True':
                 rc = os.system('rm -rf ' + sourcefile2)
@@ -909,7 +938,7 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
 
             #Instalacja image nandsim                                     
             os.system('echo "Instalacja - nandsim w toku..."') 
-            rc = os.system('insmod /lib/modules/%s/kernel/drivers/mtd/nand/nandsim.ko cache_file=' + getNeoLocation() + 'image_cache first_id_byte=0x20 second_id_byte=0xaa third_id_byte=0x00 fourth_id_byte=0x15;sleep 5' % getKernelVersion())
+            rc = os.system('insmod /lib/modules/' + getKernelVersion() + '/kernel/drivers/mtd/nand/nandsim.ko cache_file=' + getNeoLocation() + 'image_cache first_id_byte=0x20 second_id_byte=0xaa third_id_byte=0x00 fourth_id_byte=0x15;sleep 5' )#% getKernelVersion())
             cmd = 'dd if=%s of=/dev/mtdblock%s bs=2048' % (rootfname, mtd)
             rc = os.system(cmd)
             cmd = 'ubiattach /dev/ubi_ctrl -m %s -O 2048' % mtd
@@ -937,7 +966,7 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
                 os.system('sleep 5; init 4; sleep 5; init 3 ')
 
         #UBI_READER
-        elif os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.py'):
+        elif os.path.exists('' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'):
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/venton-hdx'):
                     os.chdir('venton-hdx')
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/hde'):
@@ -1095,13 +1124,23 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/xp1000'):
                     os.chdir('xp1000')
 
+                if os.path.exists('' + getNeoLocation() + 'ImagesUpload/formuler1'):
+                    os.chdir('formuler1')
+                if os.path.exists('' + getNeoLocation() + 'ImagesUpload/formuler2'):
+                    os.chdir('formuler2')
+                if os.path.exists('' + getNeoLocation() + 'ImagesUpload/formuler3'):
+                    os.chdir('formuler3')
+                if os.path.exists('' + getNeoLocation() + 'ImagesUpload/formuler4turbo'):
+                    os.chdir('formuler4turbo')
+
+
                 #Instalacja image ubi_reader  
                 os.system('echo "Instalacja - ubi_reader w toku..."')            
                 if os.path.exists('' + getNeoLocation() + 'ImagesUpload/vuplus/root_cfe_auto.*'):
                     os.system('mv -f root_cfe_auto.* rootfs.bin') 
-                cmd = 'chmod 777 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.py'
+                cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
                 rc = os.system(cmd)
-                cmd = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o' + getNeoLocation() + 'ubi'
+                cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o' + getNeoLocation() + 'ubi'
                 rc = os.system(cmd)
                 os.chdir('/home/root')
                 os.system('mv ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/%s/' % target)                
@@ -1119,9 +1158,26 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('mv -f rootfs.ubi rootfs.bin')                    
             os.system('echo "Instalacja - ubi_reader w toku..."')            
             print '[NeoBoot] Extracting UBIFS image and moving extracted image to our target'
-            cmd = 'chmod 777 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.py'
+            cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
             rc = os.system(cmd)
-            cmd = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
+            cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+            os.chdir('/home/root')
+            cmd = 'cp -r -p ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'chmod -R +x ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'rm -rf ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+            
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/et10000/rootfs.bin'):
+            os.chdir('et10000')
+            os.system('mv -f rootfs.bin rootfs.bin')                    
+            os.system('echo "Instalacja - ubi_reader w toku..."')            
+            print '[NeoBoot] Extracting UBIFS image and moving extracted image to our target'
+            cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
+            rc = os.system(cmd)
+            cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
             rc = os.system(cmd)
             os.chdir('/home/root')
             cmd = 'cp -r -p ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/' + target
@@ -1143,14 +1199,17 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation EDISION osmio4k"')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/osmio4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/osmio4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/osmio4kplus'):
+            os.system('echo "Please wait. System installation EDISION osmio4kplus"')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/osmio4kplus/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/osmio4kplus/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm900'):
             os.system('echo "Please wait. System installation Dreambox DM900."')
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)                                                     
-        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/%s.tar.xz' % source):
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/dm920'):
-            os.system('echo "Please wait. System installation spakowanego w plik tar.xz w toku..."')
+            os.system('echo "Please wait. System installation Dreambox DM920."')
-            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/%s.tar.xz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz' % source)
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm920; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm920/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz; tar -jJxvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz -C  ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd) 
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/hd51/rootfs.tar.bz2'):
             os.system('echo "Please wait. System installation AX 4K Box HD51 "')
@@ -1196,6 +1255,10 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation Revo4k."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/update/revo4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/update/revo4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/update/force3uhd'):
+            os.system('echo "Please wait. System installation force3uhd."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/update/force3uhd/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/update/force3uhd/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)            
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/update/galaxy4k'):
             os.system('echo "Please wait. System installation Galaxy4k."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/update/galaxy4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/update/galaxy4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
@@ -1208,6 +1271,14 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation Zgemma H9S ."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/zgemma/h9/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/zgemma/h9/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)                                                                          
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h9combo/rootfs.tar.bz2'):
+            os.system('echo "Please wait. System installation Zgemma h9combo ."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/h9combo/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/h9combo/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd) 
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2'):
+            os.system('echo "Please wait. System installation Zgemma h10 ."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2; tar -jxf ' + getNeoLocation() + 'ImagesUpload/h10/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd) 
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k'):
             os.system('echo "Please wait. System installation Miraclebox mini4k."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/miraclebox/mini4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
@@ -1240,10 +1311,6 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation Ferguson Ariva 4K Combo w toku..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/e2/update; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/e2/update/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)
-        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/e2/update'):
-            os.system('echo "Please wait. System installation Ferguson Ariva 4K Combo w toku..."')
-            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/dm920; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/dm920/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
-            rc = os.system(cmd) 
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2'):
             os.system('echo "Please wait. System installation beyonwiz v2 4K w toku..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/beyonwiz/v2/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
@@ -1252,14 +1319,64 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
             os.system('echo "Please wait. System installation Amiko viper4k 4K w toku..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/amiko/viper4k; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/amiko/viper4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)             
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/update/tmtwin4k'):
+            os.system('echo "Please wait. System installation tmtwin4k."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/update/tmtwin4k/rootfs.tar.bz2; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/update/tmtwin4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)  
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue/trio4k'):
-            os.system('echo "Please wait. System installation trio4k 4K Combo w toku..."')
+            os.system('echo "Please wait. System installation trio4k 4K Combo..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/gigablue/trio4k; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/gigablue/trio4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)             
         elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/gigablue/ip4k'):
-            os.system('echo "Please wait. System installation gbip4k 4K w toku..."')
+            os.system('echo "Please wait. System installation gbip4k 4K..."')
             cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/gigablue/ip4k; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/gigablue/ip4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
             rc = os.system(cmd)                                     
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/protek4k'):
+            os.system('echo "Please wait. System installation protek4k..."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/protek4k; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/protek4k/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd) 
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/multibox'):
+            os.system('echo "Please wait. System installation multibox..."')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/multibox; tar -jxvf ' + getNeoLocation() + 'ImagesUpload/multibox/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd) 
+
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.xz'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.xz w toku..."')
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.xz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz; tar -jJxvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.xz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)            
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.gz'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.gz w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.gz  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz; /bin/tar -xzvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.bz2'):
+            os.system('echo "Please wait. System installation spakowanego w plik tar.bz2 w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.tar.bz2  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2; /bin/tar -xzvf ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/' + source + '.mb'):
+            os.system('echo "Please wait. System installation spakowanego w plik .mb w toku..."')            
+            os.system('cp -r ' + getNeoLocation() + 'ImagesUpload/' + source + '.mb  ' + getNeoLocation() + 'ImagesUpload/rootfs.tar.gz')
+            cmd = 'chmod 777 ' + getNeoLocation() + 'ImagesUpload/*.tar.gz; tar -xzvf ' + getNeoLocation() + 'ImagesUpload/*.tar.gz -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'
+            rc = os.system(cmd)
+        elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/rootfs.bin'):
+            os.chdir('ImagesUpload')
+            os.system('mv -f rootfs.bin rootfs.bin')                    
+            os.system('echo "Instalacja - ubi_reader w toku..."')            
+            print '[NeoBoot] Extracting UBIFS image and moving extracted image to our target'
+            cmd = 'chmod 777 ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py'
+            rc = os.system(cmd)
+            cmd = 'python ' + extensions_path + 'NeoBoot/ubi_reader/ubi_extract_files.py rootfs.bin -o ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+            os.chdir('/home/root')
+            cmd = 'cp -r -p ' + getNeoLocation() + 'ubi/rootfs/* ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'chmod -R +x ' + getNeoLocation() + 'ImageBoot/' + target
+            rc = os.system(cmd)
+            cmd = 'rm -rf ' + getNeoLocation() + 'ubi'
+            rc = os.system(cmd)
+
         else:
             os.system('echo "NeoBoot wykrył dłąd!!! Prawdopodobnie brak pliku instalacyjnego."')
 
@@ -1274,11 +1391,11 @@ def NEOBootExtract(source, target, ZipDelete, BlackHole):
                       
             cmd = 'mkdir ' + getNeoLocation() + 'ImageBoot/%s/boot/blackhole' % target
             rc = os.system(cmd)
-            cmd = 'cp -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/version ' + getNeoLocation() + 'ImageBoot/%s/boot/blackhole' % target
+            cmd = 'cp -f ' + extensions_path + 'NeoBoot/bin/version ' + getNeoLocation() + 'ImageBoot/%s/boot/blackhole' % target
             rc = os.system(cmd)
             cmd = 'mv ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.pyo ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.pyo.org' % (target, target)
             rc = os.system(cmd)
-            cmd = 'cp -rf /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/utilsbh ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.py' % target
+            cmd = 'cp -rf ' + extensions_path + 'NeoBoot/bin/utilsbh ' + getNeoLocation() + 'ImageBoot/%s/usr/lib/enigma2/python/Blackhole/BhUtils.py' % target
             rc = os.system(cmd)
             localfile = '' + getNeoLocation() + 'ImageBoot/%s/boot/blackhole/version' % target
             temp_file = open(localfile, 'w')

NeoBoot/files/Harddisk.py

@@ -1,14 +1,23 @@
 # -*- coding: utf-8 -*-
-#from __future__ import print_function
+
-#from Plugins.Extensions.NeoBoot.__init__ import _
+from Plugins.Extensions.NeoBoot.__init__ import _
 import os
 import time
-from Tools.Directories import fileExists, pathExists#, fileCheck
+from Tools.Directories import fileExists, pathExists, fileCheck
 from Tools.CList import CList
 from Components.SystemInfo import SystemInfo
 from Components.Console import Console
-from Task import LoggingTask
+try:
+    from Task import LoggingTask
+except: 
+    from Components.Task import LoggingTask           
 import Task
+from Screens.Screen import Screen
+from Components.ActionMap import ActionMap
+from Components.MenuList import MenuList
+from Components.Label import Label
+from Components.Pixmap import Pixmap
+from Screens.MessageBox import MessageBox
 
 def readFile(filename):
     file = open(filename)
@@ -374,18 +383,21 @@ class Harddisk():
         task.weighting = 1
         task = MkfsTask(job, _('Creating filesystem'))
         big_o_options = ['dir_index']
-        if isFileSystemSupported('ext4'):
-            task.setTool('mkfs.ext4')
-            if size > 20000:
-                try:
-                    version = map(int, open('/proc/version', 'r').read().split(' ', 4)[2].split('.', 2)[:2])
-                    if version[0] > 3 or version[0] > 2 and version[1] >= 2:
-                        task.args += ['-C', '262144']
-                        big_o_options.append('bigalloc')
-                except Exception as ex:
-                    print 'Failed to detect Linux version:', ex
 
-        else:
+###__blokada hash dla ext4 >>>
+#        if isFileSystemSupported('ext4'):
+#            task.setTool('mkfs.ext4')
+#            if size > 20000:
+#                try:
+#                    version = map(int, open('/proc/version', 'r').read().split(' ', 4)[2].split('.', 2)[:2])
+#                    if version[0] > 3 or version[0] > 2 and version[1] >= 2:
+#                        task.args += ['-C', '262144']
+#                        big_o_options.append('bigalloc')
+#                except Exception as ex:
+#                    print 'Failed to detect Linux version:', ex
+#        else:
+#            task.setTool('mkfs.ext3')
+
         task.setTool('mkfs.ext3')
         if size > 250000:
             task.args += ['-T',
@@ -939,6 +951,80 @@ class MkfsTask(Task.LoggingTask):
         self.log.append(data)
 
 
+###########################__From HarddiskSetup_################################
+class HarddiskSetup(Screen):
+
+    def __init__(self, session, hdd, action, text, question):
+        Screen.__init__(self, session)
+        self.action = action
+        self.question = question
+        self.setTitle(_('Setup hard disk'))
+        self['model'] = Label(_('Model: ') + hdd.model())
+        self['capacity'] = Label(_('Capacity: ') + hdd.capacity())
+        self['bus'] = Label(_('Bus: ') + hdd.bus())
+        self['key_red'] = Label(_('Cancel'))
+        self['key_green'] = Label(text)
+        self['actions'] = ActionMap(['OkCancelActions'], {'ok': self.hddQuestion,
+         'cancel': self.close})
+        self['shortcuts'] = ActionMap(['ShortcutActions'], {'red': self.close,
+         'green': self.hddQuestion})
+
+    def hddQuestion(self):
+        message = self.question + '\n' + _('You can continue watching TV etc. while this is running.')
+        self.session.openWithCallback(self.hddConfirmed, MessageBox, message)
+
+    def hddConfirmed(self, confirmed):
+        if not confirmed:
+            return
+        try:
+            from Task import job_manager
+        except:            
+            from Components.Task import job_manager
+        try:
+            job = self.action()
+            job_manager.AddJob(job, onSuccess=job_manager.popupTaskView)
+            from Screens.TaskView import JobView
+            self.session.open(JobView, job, afterEventChangeable=False)
+        except Exception as ex:
+            self.session.open(MessageBox, str(ex), type=MessageBox.TYPE_ERROR, timeout=10)
+
+        self.close()
+
+
+class HarddiskSelection(Screen):
+    def __init__(self, session):
+        Screen.__init__(self, session)
+        self.setTitle(_('Select hard disk'))
+        self.skinName = 'HarddiskSelection'
+        if harddiskmanager.HDDCount() == 0:
+            tlist = []
+            tlist.append((_('no storage devices found'), 0))
+            self['hddlist'] = MenuList(tlist)
+        else:
+            self['hddlist'] = MenuList(harddiskmanager.HDDList())
+        self['key_red'] = Label(_('Cancel'))
+        self['key_green'] = Label(_('Select'))
+        self['actions'] = ActionMap(['OkCancelActions'], {'ok': self.okbuttonClick,
+         'cancel': self.close})
+        self['shortcuts'] = ActionMap(['ShortcutActions'], {'red': self.close,
+         'green': self.okbuttonClick})
+
+    def doIt(self, selection):
+        self.session.openWithCallback(self.close, HarddiskSetup, selection, action=selection.createInitializeJob, text=_('Initialize'), question=_('Do you really want to initialize the device?\nAll data on the disk will be lost!'))
+
+    def okbuttonClick(self):
+        selection = self['hddlist'].getCurrent()
+        if selection[1] != 0:
+            self.doIt(selection[1])
+
+
+class HarddiskFsckSelection(HarddiskSelection):
+
+    def doIt(self, selection):
+        self.session.openWithCallback(self.close, HarddiskSetup, selection, action=selection.createCheckJob, text=_('Check'), question=_('Do you really want to check the filesystem?\nThis could take lots of time!'))
+###########################__end HarddiskSetup_################################
+
+
 harddiskmanager = HarddiskManager()
 
 def isSleepStateDevice(device):

NeoBoot/files/NeoBoot.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-IMAGE=ImageBoot
-NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) 
-
-if [ -f $NEOBOOTMOUNT/NeoBoot_Backup.tar.gz  ] ; then
-        rm -R $NEOBOOTMOUNT/NeoBoot_Backupt.tar.gz         
-        /bin/tar -czf $NEOBOOTMOUNT/NeoBoot_Backup.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
-        echo " "
-        echo "Kopia o nazwie NeoBoot_Backup.tar.gz zostala utworzona w lokalizacji:"    $NEOBOOTMOUNT" . " 
-        echo " "
-else
-        /bin/tar -czf $NEOBOOTMOUNT/NeoBoot_Backup.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
-        echo " "
-        echo "Kopia o nazwie NeoBoot_Backup.tar.gz zostala utworzona w lokalizacji:"    $NEOBOOTMOUNT" . " 
-        echo " "
-fi      
-
-exit 0
-  

NeoBoot/files/S50fat.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-# script gutosie 
-IMAGEKATALOG=ImageBoot
-NEODEVICE=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) 
-
-if [ ! -e /usr/bin/ipkg ]; then 
-   ln -sfn /usr/bin/opkg /usr/bin/ipkg
-fi
-if [ ! -e /usr/bin/ipkg-cl ]; then 
-   ln -sfn /usr/bin/opkg-cl /usr/bin/ipkg-cl
-fi
-
-#echo "Start network and telnet ..."
-#/etc/init.d/networking stop; sync; /etc/init.d/networking start;
-
-                   
-if [ -f /etc/init.d/inadyn-mt ] ; then
-    /etc/init.d/inadyn-mt start
-fi
-
-if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh  ]; then
-    /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh
-fi                
-
-fi                   
-
-if [ -f /etc/rcS.d/S50fat.sh ] ; then
-                            ln -s /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh /etc/rcS.d/S50neo.sh                                                        
-                            telnetd on
-                            echo ok  
-                            rm -f /etc/rcS.d/S50fat.sh
-                            echo "file S50fat.sh delete"  
-fi 
-echo ok                                                

NeoBoot/files/Task.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 #from __future__ import print_function
 #from Plugins.Extensions.NeoBoot.__init__ import _
 from Tools.CList import CList

NeoBoot/files/devices.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __init__ import _
+ 
+from Plugins.Extensions.NeoBoot.__init__ import _ 
 from enigma import getDesktop
 from Plugins.Plugin import PluginDescriptor
 from Screens.ChoiceBox import ChoiceBox
@@ -31,27 +31,46 @@ import os
 from Screens.VirtualKeyBoard import VirtualKeyBoard
 import gettext, os
 from Plugins.Extensions.NeoBoot.files.stbbranding import getTunerModel 
+LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'
 
     
-try:
-    cat = gettext.translation('lang', '/usr/lib/enigma2/python/Plugins/Extensions/files/po', [config.osd.language.getText()])
-    _ = cat.gettext
-except IOError:
-    pass
-
 class ManagerDevice(Screen):
     screenwidth = getDesktop(0).size().width()
     if screenwidth and screenwidth == 1920:
-        skin = '<screen name="ManagerDevice" position="center,center" size="1235,748">\n\t\t<ePixmap pixmap="skin_default/buttons/red.png" position="35,16" size="253,52" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/green.png" position="315,15" size="279,50" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/yellow.png" position="647,18" size="263,48" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/blue.png" position="965,19" size="269,51" alphatest="on" />\n\t\t<widget name="key_red" position="14,17" zPosition="1" size="258,48" font="Regular;30" halign="center" valign="center" backgroundColor="un9f1313" transparent="1" />\n\t\t<widget name="key_green" position="297,17" zPosition="1" size="298,48" font="Regular;30" halign="center" valign="center" backgroundColor="un1f771f" transparent="1" />\n\t\t<widget name="key_yellow" position="631,18" zPosition="1" size="268,48" font="Regular;30" halign="center" valign="center" backgroundColor="una08500" transparent="1" />\n\t\t<widget name="key_blue" position="940,21" zPosition="1" size="266,45" font="Regular;30" halign="center" valign="center" backgroundColor="un18188b" transparent="1" />\n\t\t<widget source="list" render="Listbox" position="12,76" size="1212,651" scrollbarMode="showOnDemand">\n\t\t\t<convert type="TemplatedMultiContent">\n\t\t\t\t{"template": [\n\t\t\t\t MultiContentEntryText(pos = (90, 5), size = (600, 30), font=0, text = 0),\n\t\t\t\t MultiContentEntryText(pos = (110, 60), size = (900, 100), font=1, flags = RT_VALIGN_TOP, text = 1),\n\t\t\t\t MultiContentEntryPixmapAlphaBlend(pos = (0, 0), size = (160, 160,), png = 2),\n\t\t\t\t],\n\t\t\t\t"fonts": [gFont("Regular", 33),gFont("Regular", 33)],\n\t\t\t\t"itemHeight": 140\n\t\t\t\t}\n\t\t\t</convert>\n\t\t</widget>\n\t\t<widget name="lab1" zPosition="2" position="32,92" size="1182,69" font="Regular;30" halign="center" transparent="1" />\n\t</screen>'
+
+        skin = """<screen name="ManagerDevice" position="400,150" size="1235,748">
+            <widget name="key_red" position="14,17" zPosition="1" size="271,49" font="dugme;30" halign="center" valign="center" backgroundColor="red" transparent="1"   foregroundColor="red" />
+            <widget name="key_green" position="289,17" zPosition="1" size="369,49" font="dugme;30" halign="center" valign="center" backgroundColor="green" transparent="1"   foregroundColor="green" />
+            <widget name="key_yellow" position="661,17" zPosition="1" size="302,49" font="dugme;30" halign="center" valign="center" backgroundColor="yellow" transparent="1"   foregroundColor="yellow" />
+            <widget name="key_blue" position="967,17" zPosition="1" size="257,49" font="dugme;30" halign="center" valign="center" backgroundColor="blue" transparent="1"   foregroundColor="blue" />                                                                                                                              
+            <eLabel position="18,70" size="1204,2" backgroundColor="blue" foregroundColor="blue" name="linia" />
+            <eLabel position="18,670" size="1204,2" backgroundColor="blue" foregroundColor="blue" name="linia" />
+            <eLabel backgroundColor="black" font="dugme; 30" foregroundColor="orange" position="536,674" size="197,56" text="Exit - Back" transparent="1" />
+            <widget source="list" render="Listbox" position="14,137" size="1210,530" scrollbarMode="showOnDemand">
+            <convert type="TemplatedMultiContent">\n\n\t\t\t\t{"template": [\n\n\t\t\t\t MultiContentEntryText(pos = (90, 5), size = (600, 75), font=0, text = 0),\n\n\t\t\t\t MultiContentEntryText(pos = (110, 60), size = (900, 80), font=1, flags = RT_VALIGN_TOP, text = 1),\n\n\t\t\t\t MultiContentEntryPixmapAlphaBlend(pos = (0, 0), size = (150, 130,)),\n\n\t\t\t\t],\n\t\t\t\t"fonts": [gFont("Regular", 33),gFont("Regular", 33)],\n\n\t\t\t\t"itemHeight": 140\n\t\t\t\t}</convert>
+            </widget>
+            <widget name="lab1" zPosition="2" position="28,163" size="1182,69" font="baslk;30" halign="center" transparent="1" />
+            </screen>"""
     else:
-        skin = '<screen position="center,center" size="640,460">\n\t\t<ePixmap pixmap="skin_default/buttons/red.png" position="25,0" size="140,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/green.png" position="175,0" size="140,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/yellow.png" position="325,0" size="140,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/blue.png" position="475,0" size="140,40" alphatest="on" />\n\t\t<widget name="key_red" position="25,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />\n\t\t<widget name="key_green" position="175,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />\n\t\t<widget name="key_yellow" position="325,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />\n\t\t        <widget name="key_blue" position="475,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />\n\t\t<widget source="list" render="Listbox" position="10,50" size="620,450" scrollbarMode="showOnDemand" >\n\t\t\t<convert type="TemplatedMultiContent">\n\t\t\t\t{"template": [\n\t\t\t\t MultiContentEntryText(pos = (90, 0), size = (600, 30), font=0, text = 0),\n\t\t\t\t MultiContentEntryText(pos = (110, 30), size = (600, 50), font=1, flags = RT_VALIGN_TOP, text = 1),\n\t\t\t\t MultiContentEntryPixmapAlphaBlend(pos = (0, 0), size = (80, 80), png = 2),\n\t\t\t\t],\n\t\t\t\t"fonts": [gFont("Regular", 24),gFont("Regular", 20)],\n\t\t\t\t"itemHeight": 85\n\t\t\t\t}\n\t\t\t</convert>\n\t\t</widget>\n\t\t<widget name="lab1" zPosition="2" position="50,90" size="600,40" font="Regular;22" halign="center" transparent="1"/>\n\t</screen>'
+        skin = """<screen name="ManagerDevice" position="center,center" size="752,460">
+        <eLabel backgroundColor="black" font="Regular; 30" foregroundColor="orange" position="315,405" size="169,51" text="Exit - Back" transparent="1" />        
+        <widget name="key_red" position="21,0" zPosition="1" size="151,47" font="Regular;20" halign="center" valign="center" backgroundColor="red" transparent="1" foregroundColor="red" />
+        <widget name="key_green" position="216,0" zPosition="1" size="140,47" font="Regular;20" halign="center" valign="center" backgroundColor="green" transparent="1" foregroundColor="green" />
+        <widget name="key_yellow" position="400,0" zPosition="1" size="140,47" font="Regular;20" halign="center" valign="center" backgroundColor="yellow" transparent="1" foregroundColor="yellow" />       
+        <widget name="key_blue" position="587,0" zPosition="1" size="149,46" font="Regular;20" halign="center" valign="center" backgroundColor="blue" transparent="1" foregroundColor="blue" />
+        <widget source="list" render="Listbox" position="18,63" size="721,341" scrollbarMode="showOnDemand">
+        <convert type="TemplatedMultiContent">\n\t\t\t\t{"template": [\n\t\t\t\t MultiContentEntryText(pos = (90, 0), size = (600, 30), font=0, text = 0),\n\t\t\t\t MultiContentEntryText(pos = (110, 30), size = (600, 50), font=1, flags = RT_VALIGN_TOP, text = 1),\n\t\t\t\t MultiContentEntryPixmapAlphaBlend(pos = (0, 0), size = (80, 80)),\n\t\t\t\t],\n\t\t\t\t"fonts": [gFont("Regular", 24),gFont("Regular", 20)],\n\t\t\t\t"itemHeight": 85\n\t\t\t\t}\n\t\t\t</convert>
+        </widget>
+        <widget name="lab1" zPosition="2" position="29,111" size="699,40" font="Regular;22" halign="center" transparent="1" />
+        </screen>"""
+
 
     def __init__(self, session):
         Screen.__init__(self, session)
         Screen.setTitle(self, _('Mount Manager'))
-        self['key_red'] = Label(_('Initialize'))
+        self['key_red'] = Label(_('Initialize ext3'))
         self['key_green'] = Label(_('SetupMounts'))
-        self['key_yellow'] = Label(_('Unmount'))
+        self['key_yellow'] = Label(_('Initialize ext4'))
         self['key_blue'] = Label(_('Exit'))
         self['lab1'] = Label()
         self.onChangedEntry = []
@@ -59,15 +78,33 @@ class ManagerDevice(Screen):
         self['list'] = List(self.list)
         self['list'].onSelectionChanged.append(self.selectionChanged)
         self['actions'] = ActionMap(['WizardActions', 'ColorActions', 'MenuActions'], {'back': self.close,
-         'red': self.Format,
+         'red': self.Format_ext3,
          'green': self.SetupMounts,
-         'yellow': self.Unmount,
+         'yellow': self.Format_ext4,
-         'blue': self.Mount})
+         'blue': self.ExitBack,
+         'back': self.close})
         self.activityTimer = eTimer()
         self.activityTimer.timeout.get().append(self.updateList2)
         self.updateList()
         self.onShown.append(self.setWindowTitle)
 
+    def Format_ext3(self):
+        try:
+            if fileExists('/etc/vtiversion.info') or fileExists('/etc/bhversion'):                    
+                self.session.open(MessageBox, _("This option is available only from openpli or derivatives."), MessageBox.TYPE_INFO, timeout=10)
+            else:
+                from Harddisk import HarddiskSelection
+                self.session.openWithCallback(self.updateList, HarddiskSelection)
+        except:
+            self.session.open(MessageBox, _("This option is available only from openpli or derivatives."), MessageBox.TYPE_INFO, timeout=10)
+
+    def Format_ext4(self):
+        from Screens.HarddiskSetup import HarddiskSelection
+        self.session.openWithCallback(self.updateList, HarddiskSelection)
+
+    def ExitBack(self):
+        self.close()    
+
     def setWindowTitle(self):
         self.setTitle(_('Mount Manager'))
 
@@ -124,19 +161,23 @@ class ManagerDevice(Screen):
         devicetype = path.realpath('/sys/block/' + device2 + '/device')
         d2 = device
         name = _('HARD DISK: ')        
-        mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_hdd.png'
+        mypixmap = '' + LinkNeoBoot + '/images/dev_hdd.png'
         model = file('/sys/block/' + device2 + '/device/model').read()
         model = str(model).replace('\n', '')
         des = ''
         if devicetype.find('usb') != -1:
             name = _('USB: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'
         if devicetype.find('usb1') != -1:
             name = _('USB1: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'   
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'   
         if devicetype.find('usb2') != -1:
             name = _('USB2: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'                      
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'                      
+        if devicetype.find('card') != -1:
+            name = _('CARD: ')
+            mypixmap = '' + LinkNeoBoot + '/images/dev_sd.png' 
+
         name = name + model
         self.Console = Console()
         self.Console.ePopen("sfdisk -l /dev/sd? | grep swap | awk '{print $(NF-9)}' >/tmp/devices.tmp")
@@ -198,13 +239,6 @@ class ManagerDevice(Screen):
             os.system('cp /etc/fstab.org /etc/fstab')
         self.session.openWithCallback(self.updateList, DevicesConf)
 
-    def Format(self):
-        from Screens.HarddiskSetup import HarddiskSelection
-        self.session.openWithCallback(self.updateList, HarddiskSelection)
-
-    def Mount(self):
-        self.close()
-
     def Unmount(self):
         sel = self['list'].getCurrent()
         if sel:
@@ -270,9 +304,19 @@ class ManagerDevice(Screen):
 class DevicesConf(Screen, ConfigListScreen):
     screenwidth = getDesktop(0).size().width()
     if screenwidth and screenwidth == 1920:
-        skin = '<screen name="DevicesConf" position="center,center" size="976,728" title="Choose where to mount your devices to:">\n\t\t<ePixmap pixmap="skin_default/buttons/red.png" position="109,16" size="251,63" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/green.png" position="551,15" size="257,63" alphatest="on" />\n\t\t<widget name="key_red" position="110,13" zPosition="1" size="252,67" font="Regular;35" halign="center" valign="center" backgroundColor="#FF0000" transparent="1" />\n\t\t<widget name="key_green" position="549,15" zPosition="1" size="262,65" font="Regular;35" halign="center" valign="center" backgroundColor="#008000" transparent="1" />\n\t\t<widget name="config" position="31,113" size="898,489" font="Regular;25" scrollbarMode="showOnDemand" />\n\t\t<widget name="Linconn" position="34,621" size="904,32" font="Regular;33" halign="center" valign="center" backgroundColor="#FF0000" />\n\t</screen>'
+        skin = """<screen name="DevicesConfFullHD" position="400,150" size="976,728" title="Choose where to mount your devices to:">        
+        <eLabel backgroundColor="black" font="baslk; 25" foregroundColor="red" position="150,900" size="800,30" text=" Exit - Back " transparent="1" /> 
+        <widget name="key_red" position="110,13" zPosition="1" size="335,67" font="baslk;30" halign="center" valign="center" backgroundColor="red" transparent="1" foregroundColor="red" />
+        <widget name="key_green" position="549,15" zPosition="1" size="362,65" font="baslk;30" halign="center" valign="center" backgroundColor="green" transparent="1" foregroundColor="green" />
+        <widget name="config" position="33,179" size="891,385" font="Regular;21" scrollbarMode="showOnDemand" />
+        </screen>"""
     else:
-        skin = '<screen position="center,center" size="640,460" title="Choose where to mount your devices to:">\n\t\t<ePixmap pixmap="skin_default/buttons/red.png" position="25,0" size="140,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/green.png" position="175,0" size="140,40" alphatest="on" />\n\t\t<widget name="key_red" position="25,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />\n\t\t<widget name="key_green" position="175,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />\n\t\t<widget name="config" position="30,60" size="580,275" scrollbarMode="showOnDemand"/>\n\t\t<widget name="Linconn" position="30,375" size="580,20" font="Regular;18" halign="center" valign="center" backgroundColor="#9f1313"/>\n\t</screen>'
+        skin = """<screen name="DevicesConfHD" position="171,130" size="903,460" title="Choose where to mount your devices to:">
+        <eLabel backgroundColor="black" font="Regular;30" foregroundColor="orange" position="366,388" size="295,65" text="Exit - Back" transparent="1" />
+        <widget name="key_red" position="36,0" zPosition="1" size="363,59" font="Regular;30" halign="center" valign="center" backgroundColor="black" transparent="1" foregroundColor="red" />
+        <widget name="key_green" position="548,0" zPosition="1" size="332,60" font="Regular;30" halign="center" valign="center" backgroundColor="black" transparent="1" foregroundColor="green" />
+        <widget name="config" position="31,85" size="839,279" scrollbarMode="showOnDemand" />
+        </screen>"""
 
     def __init__(self, session):
         Screen.__init__(self, session)
@@ -326,19 +370,23 @@ class DevicesConf(Screen, ConfigListScreen):
         devicetype = path.realpath('/sys/block/' + device2 + '/device')
         d2 = device
         name = _('HARD DISK: ')
-        mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_hdd.png'
+        mypixmap = '' + LinkNeoBoot + '/images/dev_hdd.png'
         model = file('/sys/block/' + device2 + '/device/model').read()
         model = str(model).replace('\n', '')
         des = ''
         if devicetype.find('usb') != -1:
             name = _('USB: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'
         if devicetype.find('usb1') != -1:
             name = _('USB1: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'
         if devicetype.find('usb2') != -1:
             name = _('USB2: ')
-            mypixmap = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/dev_usb.png'            
+            mypixmap = '' + LinkNeoBoot + '/images/dev_usb.png'            
+        if devicetype.find('card') != -1:
+            name = _('CARD: ')
+            mypixmap = '' + LinkNeoBoot + '/images/dev_sd.png'
+            
         name = name + model
         f = open('/proc/mounts', 'r')
         for line in f.readlines():
@@ -369,7 +417,11 @@ class DevicesConf(Screen, ConfigListScreen):
          ('/media/usb', '/media/usb'),
          ('/media/usb1', '/media/usb1'),
          ('/media/usb2', '/media/usb2'),
-         ('/media/usb3', '/media/usb3')]))
+         ('/media/usb3', '/media/usb3'),
+         ('/media/usb3', '/media/cf'),
+         ('/media/usb3', '/media/card'),
+         ('/media/cf', '/media/cf'),
+         ('/media/card', '/media/card')]))
         if dtype == 'Linux':
             dtype = 'ext2', 'ext3', 'ext4' 
         else:
@@ -434,73 +486,77 @@ class DevicesConf(Screen, ConfigListScreen):
             out.close()
 
             self.device_uuid2 = result.split('UUID=')[1].split(' ')[0].replace('"', '')
-            if fileExists('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager2'):
+#            if fileExists('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager2'):
-                out1 = open('/etc/devicemanager.cfg', 'a')
+#                out1 = open('/etc/devicemanager.cfg', 'a')
-                line1 = '"' + self.device_uuid2 + '"' + ':' + self.mountp + '\n'
+#                line1 = '"' + self.device_uuid2 + '"' + ':' + self.mountp + '\n'
-                out1.write(line1)
+#                out1.write(line1)
-                out1.close()
+#                out1.close()
-            elif fileExists('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager'):
+#            elif fileExists('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager'):
-                out2 = open('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager/devicemanager.cfg', 'a')
+#                out2 = open('/usr/lib/enigma2/python/Plugins/SystemPlugins/DeviceManager/devicemanager.cfg', 'a')
-                line2 = '"' + self.device_uuid2 + '"' + ':' + self.mountp + '\n'
+#                line2 = '"' + self.device_uuid2 + '"' + ':' + self.mountp + '\n'
-                out2.write(line2)
+#                out2.write(line2)
-                out2.close()
+#                out2.close()
-                    
-            if fileExists('/etc/init.d/udev'):
-                filename = '/etc/init.d/udev'
-                if os.path.exists(filename):
-
-                    filename2 = filename + '.tmp'
-                    out = open(filename2, 'w')
-                    f = open(filename, 'r')
-                    for line in f.readlines():
-                        if line.find('mount -a /media/hdd; mount -a /media/usb') != -1:
-                            line = ''
-                        out.write(line)
-
-                    f.close()
-                    out.close()
-                    os.rename(filename2, filename)
                                                                               
 
-                    filename2 = filename + '.tmp'
-                    out = open(filename2, 'w')
-                    f = open(filename, 'r')
-                    for line in f.readlines():
-                        if line.find('exit 0') != -1:
-                            line = ''
-                        out.write(line)
-
-                    f.close()
-                    out.close()
-                    os.rename(filename2, filename)
-                    os.system('echo "mount -a /media/hdd; mount -a /media/usb" >> /etc/init.d/udev; chmod 0755 /etc/init.d/udev ')
-
-            if fileExists('/etc/init.d/mdev'):
-                filename = '/etc/init.d/mdev'
-                if os.path.exists(filename):
-
-                    filename2 = filename + '.tmp'
-                    out = open(filename2, 'w')
-                    f = open(filename, 'r')
-                    for line in f.readlines():
-                        if line.find('mount -a /media/hdd; mount -a /media/usb') != -1:
-                            line = ''
-                        out.write(line)
-
-                    f.close()
-                    out.close()
-                    os.rename(filename2, filename)
-                    
-                    system('echo "" >> /etc/init.d/mdev; echo "mount -a /media/hdd; mount -a /media/usb" >> /etc/init.d/mdev; chmod 0755 /etc/init.d/mdev ')
            
 
+
+#SetDiskLabel - dziekuje autorowi
 class SetDiskLabel(Screen):
-    skin = '\n\t\t<screen position="center,center" size="600,200" title="Set Disk Label v1.1" >\n\t\t<widget name="infoTXT" position="25,20" zPosition="1" size="310,25" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1"/>\n\t\t<widget name="devlist" position="400,20" size="125,25" />\n\t\t<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/buttons/k_left.png" position="350,15" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/buttons/k_right.png" position="550,15" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/buttons/k_up.png" position="350,105" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/buttons/k_down.png" position="550,105" size="40,40" alphatest="on" />\n\t\t<widget name="labelname" position="25,65" zPosition="1" size="310,25" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1"/>\n\t\t<widget name="disklabel" position="400,65" size="125,25" zPosition="1" font="Regular;20" halign="center" valign="left"/>\n\t\t<widget name="labeltoset" position="25,110" zPosition="1" size="310,25" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1"/>\n\t\t<widget name="listlabel" position="400,110" size="125,25" zPosition="1" font="Regular;20" halign="center" valign="left"/>\n\t\t<ePixmap pixmap="skin_default/buttons/key_red.png" position="40,167" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/key_green.png" position="170,167" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/key_yellow.png" position="300,167" size="40,40" alphatest="on" />\n\t\t<ePixmap pixmap="skin_default/buttons/key_blue.png" position="430,167" size="40,40" alphatest="on" />\n\t\t<widget name="key_red" position="70,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />\n\t\t<widget name="key_green" position="200,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />\n\t\t<widget name="key_yellow" position="330,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />\n\t\t<widget name="key_blue" position="460,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />\n\t</screen>'
+    screenwidth = getDesktop(0).size().width()
+    if screenwidth and screenwidth == 1920:    
+        skin ="""<screen name="SetDiskLabel" position="400,188" size="1100,601" title="Set Disk Label v1.1">
+      <widget name="infoTXT" position="22,62" zPosition="1" size="591,86" font="baslk;28" halign="left" valign="center" backgroundColor="transpBlack" transparent="1" />
+
+      <widget name="devlist" position="685,60" size="310,132" font="Regular;20" valign="center" />
+      
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_left.png" position="628,86" size="40,40" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_right.png" position="1015,85" size="40,40" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_up.png" position="630,381" size="40,42" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_down.png" position="1010,383" size="40,40" alphatest="on" />
+
+      <widget name="labelname" position="22,209" zPosition="1" size="591,86" font="baslk;30" valign="center" backgroundColor="transpBlack" transparent="1" />
+      <widget name="disklabel" position="697,212" size="290,77" zPosition="1" font="baslk;30" valign="left" />
+      <widget name="labeltoset" position="22,363" zPosition="1" size="591,86" font="baslk;30" valign="center" backgroundColor="transpBlack" transparent="1" />
+      <widget name="listlabel" position="685,354" size="310,145" zPosition="1" font="Regular;20" valign="center" />
+
+      <ePixmap pixmap="skin_default/buttons/key_red.png" position="14,534" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_green.png" position="259,535" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_yellow.png" position="567,535" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_blue.png" position="814,532" size="40,40" alphatest="on" />
+      
+      <widget name="key_red" position="60,526" zPosition="1" size="196,40" font="baslk;25" halign="left" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_green" position="304,526" zPosition="1" size="255,40" font="baslk;25" halign="left" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_yellow" position="613,526" zPosition="1" size="196,40" font="baslk;25" halign="left" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_blue" position="860,526" zPosition="1" size="233,40" font="baslk;25" halign="left" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <eLabel text="%s" font="Regular; 25" position="23,-10" size="968,57" halign="center" foregroundColor="yellow" backgroundColor="black" transparent="1" />
+      </screen> """ % (_('!!!Do not set the label for /dev/mmcblk0p !!!'))
+    else:
+        skin = """<screen position="center,center" size="600,200" title="Set Disk Label v1.1" >
+      <widget name="infoTXT" position="25,20" zPosition="1" size="310,38" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1" />
+      <widget name="devlist" position="400,20" size="125,25" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_left.png" position="350,15" size="40,40" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_right.png" position="550,15" size="40,40" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_up.png" position="350,105" size="40,40" alphatest="on" />
+      <ePixmap pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/k_down.png" position="550,105" size="40,40" alphatest="on" />
+      <widget name="labelname" position="25,65" zPosition="1" size="310,25" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1"/>
+      <widget name="disklabel" position="400,65" size="125,25" zPosition="1" font="Regular;20" halign="center" valign="left"/>
+      <widget name="labeltoset" position="25,110" zPosition="1" size="310,25" font="Regular;20" halign="left" valign="center" backgroundColor="transpBlack" transparent="1"/>
+      <widget name="listlabel" position="400,110" size="125,25" zPosition="1" font="Regular;20" valign="left"/>
+      <ePixmap pixmap="skin_default/buttons/key_red.png" position="40,167" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_green.png" position="170,167" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_yellow.png" position="300,167" size="40,40" alphatest="on" />
+      <ePixmap pixmap="skin_default/buttons/key_blue.png" position="430,167" size="40,40" alphatest="on" />
+      <widget name="key_red" position="70,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_green" position="200,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_yellow" position="330,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />
+      <widget name="key_blue" position="460,160" zPosition="1" size="90,40" font="Regular;14" halign="center" valign="left" backgroundColor="transpBlack" transparent="1" />
+      </screen>"""
 
     def __init__(self, session):
         global liczymy
         Screen.__init__(self, session)
-        self.labList = ['hdd', 'usb']
+        self.labList = ['hdd', 'usb','card', 'cf']
         self.list = []
         self.sprDev()
         self.devlist = []
@@ -653,6 +709,6 @@ class DeviceManagerSummary(Screen):
 
 def SkinPath():
     myskinpath = resolveFilename(SCOPE_CURRENT_SKIN, '')
-    if myskinpath == '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/':
+    if myskinpath == '' + LinkNeoBoot + '/images/':
-        myskinpath = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/'
+        myskinpath = '' + LinkNeoBoot + '/images/'
     return myskinpath

NeoBoot/files/neo_location

@@ -1,22 +0,0 @@
-#!/bin/sh
-IMAGE=ImageBoot
-NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) 
-rm -f /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-
-                            orgimag=`mount | sed '/sd/!d' | cut -d" " -f1`
-                               for item in $orgimag; do
-                                   ohdd=`echo  $item | cut -d"/" -f3`
-                                   nhdd=`mount | sed "/\$ohdd/!d" | sed q | cut -d" " -f3`
-                                   if [ $nhdd == '$NEOBOOTMOUNT' ]; then
-                                      echo $nhdd  
-                                      echo "mkdir "$nhdd  >> /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                                      echo "mount "$item $nhdd  >> /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom                                                                          
-                                   else
-                                      echo "umount "$nhdd  >> /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                                      echo "mkdir "$nhdd  >> /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                                      echo "mount "$item $nhdd  >> /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                                      echo ok
-                                   fi    
-                               done
-                               chmod 0755 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neom
-                               

NeoBoot/files/neobackup.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+#script by gutosie
+
+if `grep -q 'osd.language=pl_PL' </etc/enigma2/settings`; then
+  PL=1
+fi
+
+IMAGE=ImageBoot
+LOCATIONBACKUP=CopyNEOBoot
+NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) 
+TiME=$(date +"%Y%m%d_%H%M%S")
+UPDATEv=$(cat $NEOBOOTMOUNT/ImageBoot/.updateversion)
+NB=_NeoBoot_ 
+        
+if [ ! -e $NEOBOOTMOUNT$LOCATIONBACKUP  ]; then
+    mkdir $NEOBOOTMOUNT$LOCATIONBACKUP > /dev/null 2>&1
+    /bin/tar -czf $NEOBOOTMOUNT/CopyNEOBoot/Copy_$UPDATEv$NB$TiME.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
+    echo " "
+    [ $PL ] && echo "Kopia wtyczki neoboot o nazwie Copy_$UPDATEv$NB$TiME.tar.gz utworzono w:"    $NEOBOOTMOUNT$LOCATIONBACKUP"  "  || echo "Copy named Copy_$UPDATEv$NB$TiME.tar.gz was created at location:"    $NEOBOOTMOUNT$LOCATIONBACKUP"  " 
+    echo " "     
+else        
+    /bin/tar -czf $NEOBOOTMOUNT/CopyNEOBoot/Copy_$UPDATEv$NB$TiME.tar.gz /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot*/
+    echo " "
+    [ $PL ] && echo "Kopia wtyczki o nazwie Copy_$UPDATEv$NB$TiME.tar.gz utworzono w:"    $NEOBOOTMOUNT$LOCATIONBACKUP"  "  || echo "Copy named Copy_$UPDATEv$NB$TiME.tar.gz was created at location:"    $NEOBOOTMOUNT$LOCATIONBACKUP"  " 
+    echo " "      
+fi
+exit 0 

NeoBoot/files/neoconsole.py

@@ -0,0 +1,220 @@
+# -*- coding: utf-8 -*- 
+ 
+from Plugins.Extensions.NeoBoot.__init__ import _ 
+from enigma import eConsoleAppContainer
+from Screens.Screen import Screen
+from Components.ActionMap import ActionMap
+from Components.ScrollLabel import ScrollLabel
+from Components.Sources.StaticText import StaticText
+from Screens.MessageBox import MessageBox
+from Components.Label import Label
+
+
+class Console(Screen):
+    skin = """<screen name="ConsoleN" position="80,100" size="1010,230" title="Command execution...">
+    <widget name="text" position="-2,-1" size="1015,230" font="Console;14" />
+    </screen>"""
+
+#    def __init__(self, session, title = 'Console', cmdlist = None, finishedCallback = None, closeOnSuccess = False):
+#        Screen.__init__(self, session)
+
+    def __init__(self, session, title = _('Console'), cmdlist = None, finishedCallback = None, closeOnSuccess = False):
+        Screen.__init__(self, session)
+        self.finishedCallback = finishedCallback
+        self.closeOnSuccess = closeOnSuccess
+        self.errorOcurred = False
+        self['key_red'] = Label(_('Stop action'))
+        self['key_green'] = Label(_('Hide Console'))                                                
+        self['text'] = ScrollLabel('')
+        self['summary_description'] = StaticText('')
+        self['actions'] = ActionMap(['WizardActions', 'DirectionActions', 'ColorActions'], {'ok': self.cancel,
+         'back': self.cancel,
+         'up': self.key_up,
+         'down': self.key_down,        
+         'green': self.key_green,
+         'red': self.key_red}, -1)
+        self.cmdlist = cmdlist
+        self.newtitle = title
+        self.screen_hide = False
+        self.cancel_msg = None
+        self.output_file = ''
+        self.onShown.append(self.updateTitle)
+        self.container = eConsoleAppContainer()
+        self.run = 0
+        self.container.appClosed.append(self.runFinished)
+        self.container.dataAvail.append(self.dataAvail)
+        self.onLayoutFinish.append(self.startRun)
+        return
+
+    def updateTitle(self):
+        self.setTitle(self.newtitle)
+
+    def doExec(self, cmd):
+        if isinstance(cmd, (list, tuple)):
+            return self.container.execute(cmd[0], *cmd)
+        else:
+            return self.container.execute(cmd)
+
+    def startRun(self):
+        self['text'].setText(_('Execution progress:') + '\n\n')
+        self['summary_description'].setText(_('Execution progress:'))
+        print '[Console] executing in run', self.run, ' the command:', self.cmdlist[self.run]
+        if self.doExec(self.cmdlist[self.run]):
+            self.runFinished(-1)
+
+    def runFinished(self, retval):
+        if retval:
+            self.errorOcurred = True
+            self.toggleScreenHide(True)
+        self.run += 1
+        if self.run != len(self.cmdlist):
+            if self.doExec(self.cmdlist[self.run]):
+                self.runFinished(-1)
+        else:
+#            self['key_red'].setText(_('Close'))
+#            self['key_green'].setText(_('Save'))
+            self.toggleScreenHide(True)
+            if self.cancel_msg:
+                self.cancel_msg.close()
+            from Tools.Directories import fileExists    
+            if not fileExists('/etc/vtiversion.info'):
+                lastpage = self['text'].isAtLastPage()
+            self['text'].appendText('\n' + _('Execution finished!!'))
+            self['summary_description'].setText('\n' + _('Execution finished!!'))
+            if self.finishedCallback is not None:
+                self.finishedCallback()
+            if not self.errorOcurred and self.closeOnSuccess:
+                self.output_file = 'end'
+                self.cancel()
+        return
+
+    def key_up(self):
+        if self.screen_hide:
+            self.toggleScreenHide()
+            return
+        self['text'].pageUp()
+
+    def key_down(self):
+        if self.screen_hide:
+            self.toggleScreenHide()
+            return
+        self['text'].pageDown()
+
+    def key_green(self):
+        if self.screen_hide:
+            self.toggleScreenHide()
+            return
+        if self.output_file == 'end':
+            pass
+        elif self.output_file.startswith('/tmp/'):
+            self['text'].setText(self.readFile(self.output_file))
+            self['key_green'].setText(_(' '))
+            self.output_file = 'end'
+        elif self.run == len(self.cmdlist):
+            self.saveOutputText()
+            #self.toggleScreenHide()
+        else:
+            self.toggleScreenHide()
+
+    def key_red(self):
+        if self.screen_hide:
+            self.toggleScreenHide()
+            return
+        if self.run == len(self.cmdlist):
+            self.cancel()
+        else:
+            self.cancel_msg = self.session.openWithCallback(self.cancelCB, MessageBox, _('Cancel execution?'), type=MessageBox.TYPE_YESNO, default=False)
+
+    def cancelCB(self, ret = None):
+        self.cancel_msg = None
+        if ret:
+            self.cancel(True)
+        return
+
+    def saveOutputText(self):
+        from time import time, localtime
+        lt = localtime(time())
+        self.output_file = '/tmp/%02d%02d%02d_console.txt' % (lt[3], lt[4], lt[5])
+        self.session.openWithCallback(self.saveOutputTextCB, MessageBox, _("Save the commands and the output to a file?\n('%s')") % self.output_file, type=MessageBox.TYPE_YESNO, default=True)
+
+    def formatCmdList(self, source):
+        if isinstance(source, (list, tuple)):
+            for x in source:
+                for y in self.formatCmdList(x):
+                    yield y
+
+        else:
+            yield source
+
+    def saveOutputTextCB(self, ret = None):
+        if ret:
+            from os import path
+            failtext = _("Path to save not exist: '/tmp/'")
+            if path.exists('/tmp/'):
+                text = 'commands ...\n\n'
+                try:
+                    cmdlist = list(self.formatCmdList(self.cmdlist))
+                    text += 'command line: %s\n\n' % cmdlist[0]
+                    script = ''
+                    for cmd in cmdlist[0].split():
+                        if '.' in cmd:
+                            if cmd[-3:] in ('.py', '.sh'):
+                                script = cmd
+                            break
+
+                    if script and path.isfile(script):
+                        text += 'script listing: %s\n\n%s\n\n' % (script, self.readFile(script))
+                    if len(cmdlist) > 1:
+                        text += 'next commands:\n\n' + '\n'.join(cmdlist[1:]) + '\n\n'
+                except:
+                    text += 'error read commands!!!\n\n'
+
+                text += '-' * 50 + '\n\noutputs ...\n\n%s' % self['text'].getText()
+                try:
+                    f = open(self.output_file, 'w')
+                    f.write(text)
+                    f.close()
+                    self['key_green'].setText(_('Load'))
+                    return
+                except:
+                    failtext = _("File write error: '%s'") % self.output_file
+
+            self.output_file = 'end'
+            self['key_green'].setText(_(' '))
+            self.session.open(MessageBox, failtext, type=MessageBox.TYPE_ERROR)
+        else:
+            self.output_file = ''
+
+    def toggleScreenHide(self, setshow = False):
+        if self.screen_hide or setshow:
+            self.show()
+        else:
+            self.hide()
+        self.screen_hide = not (self.screen_hide or setshow)
+
+    def readFile(self, file):
+        try:
+            with open(file, 'r') as rdfile:
+                rd = rdfile.read()
+            rdfile.close()
+        except:
+            if file == self.output_file:
+                rd = self['text'].getText()
+            else:
+                rd = "File read error: '%s'\n" % file
+
+        return rd
+
+    def cancel(self, force = False):
+        if self.screen_hide:
+            self.toggleScreenHide()
+            return
+        if force or self.run == len(self.cmdlist):
+            self.close()
+            self.container.appClosed.remove(self.runFinished)
+            self.container.dataAvail.remove(self.dataAvail)
+            if self.run != len(self.cmdlist):
+                self.container.kill()
+
+    def dataAvail(self, str):
+        self['text'].appendText(str)

NeoBoot/files/stbbranding.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-#from __future__ import print_function
+
-#from Plugins.Extensions.NeoBoot.__init__ import _ , Log, PluginPath
+from Plugins.Extensions.NeoBoot.__init__ import _ 
 import sys
 import os
 import time        
@@ -9,6 +9,17 @@ from Tools.Directories import fileExists, SCOPE_PLUGINS
 def fileCheck(f, mode = 'r'):
     return fileExists(f, mode) and f
 
+#check imageATV
+def getImageATv():
+    atvimage='UNKNOWN'
+    if os.path.exists('/etc/issue.net'):
+        with open('/etc/issue.net', 'r') as f:
+            lines = f.read()
+            f.close()
+        if lines.find('openatv') != -1:
+            atvimage='okfeedCAMatv'
+    return atvimage
+
 #check install
 def getNeoLocation():
     locatino='UNKNOWN'
@@ -18,6 +29,44 @@ def getNeoLocation():
             f.close()     
     return locatino
 
+
+#check ext
+def getFormat():
+    neoformat='UNKNOWN'    
+    if os.path.exists('/proc/mounts'):
+        with open('/proc/mounts', 'r') as f:
+            lines = f.read()
+            f.close()
+        if lines.find('ext2') != -1:
+            neoformat='ext2'
+        elif lines.find('ext3') != -1:
+            neoformat='ext3'
+        elif lines.find('ext4') != -1:
+            neoformat='ext4'
+        elif lines.find('nfs') != -1:
+            neoformat='nfs'
+
+    return neoformat 
+
+
+def getNEO_filesystems():
+    neo_filesystems='UNKNOWN'    
+    if os.path.exists('/tmp/.neo_format'):
+        with open('/tmp/.neo_format', 'r') as f:
+            lines = f.read()
+            f.close()
+        if lines.find('ext2') != -1:
+            neo_filesystems='1'
+        elif lines.find('ext3') != -1:
+            neo_filesystems='1'
+        elif lines.find('ext4') != -1:
+            neo_filesystems='1'
+        elif lines.find('nfs') != -1:
+            neo_filesystems='1'
+
+    return neo_filesystems
+
+
 def Log(param = ''):
     global LogFileObj
     #first close object if exists
@@ -68,14 +117,14 @@ def getCPUtype():
 #check install
 def getFSTAB():
     install='UNKNOWN'
-    if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo'):
+    if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid'):
-        with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo', 'r') as f:
+        with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid', 'r') as f:
             lines = f.read()
             f.close()
         if lines.find('UUID') != -1:
-            install='OKinstall'
+            install='UUID'
         elif not lines.find('UUID') != -1:
-            install='NOinstall'
+            install='NOUUID'
     return install 
     
 def getFSTAB2():
@@ -87,7 +136,7 @@ def getFSTAB2():
         if lines.find('UUID') != -1:
             install='OKinstall'
         elif not lines.find('UUID') != -1:
-            install='NOinstall'
+            install='NOUUID'
     return install    
 
 def getINSTALLNeo():
@@ -145,7 +194,6 @@ def getLabelDisck():
             f.close()
         if lines.find('LABEL=') != -1:
             label='LABEL='      
-           
     return label   
 
 #checking device  neo      
@@ -209,7 +257,6 @@ def getNeoMount2():
         elif lines.find('/dev/sdf1 /media/usb2') != -1:
             neo='usb_install_/dev/sdf1'
 
-
     return neo
 
 def getNeoMount3():
@@ -350,22 +397,57 @@ def runCMDS(cmdsList):
     ret = os.system(myCMD)
     return rett           
 
-#####################################
 
-def getImageDistro():
+def getImageDistroN(): 
-    if fileExists('/etc/issue.net'):
+    image='Internal storage'             
-        try:
+
+    if fileExists('/.multinfo') and fileExists ('%sImageBoot/.imagedistro' % getNeoLocation() ): 
+                    with open('%sImageBoot/.imagedistro' % getNeoLocation() , 'r') as f:
+                        image = f.readline().strip()
+                        f.close()
+                        
+    elif not fileExists('/.multinfo') and fileExists('/etc/vtiversion.info'):
+                    f = open("/etc/vtiversion.info",'r')
+                    imagever = f.readline().strip().replace("Release ", " ")
+                    f.close()
+                    image = imagever
+
+    elif not fileExists('/.multinfo') and fileExists('/etc/bhversion'):
+                    f = open("/etc/bhversion",'r')
+                    imagever = f.readline().strip()
+                    f.close()
+                    image = imagever
+
+#    elif not fileExists('/.multinfo') and fileExists('/etc/vtiversion.info'):
+#                    image = 'VTI Team Image ' 
+                    
+    elif fileExists('/.multinfo') and fileExists('/etc/bhversion'):
+                    image = 'Flash ' + ' ' + getBoxHostName()
+
+    elif fileExists('/.multinfo') and fileExists('/etc/vtiversion.info'):
+                    image = 'Flash ' + ' ' + getBoxHostName()
+
+
+    elif fileExists('/usr/lib/enigma2/python/boxbranding.so') and not fileExists('/.multinfo'): 
+                    from boxbranding import getImageDistro
+                    image = getImageDistro()
+
+    elif fileExists('/media/InternalFlash/etc/issue.net') and fileExists('/.multinfo') and not fileExists('%sImageBoot/.imagedistro' % getNeoLocation() ):
+                    obraz = open('/media/InternalFlash/etc/issue.net', 'r').readlines()
+                    imagetype = obraz[0][:-3]
+                    image = imagetype
+     
+    elif fileExists('/etc/issue.net') and not fileExists('/.multinfo'):
                     obraz = open('/etc/issue.net', 'r').readlines()
-            imagetype = obraz[0][:-1]
+                    imagetype = obraz[0][:-3]
-            image = imagetype[0:-2]
+                    image = imagetype                        
-            return image
+
-        except:
+    else:
-            False
+                    image = 'Inernal Flash ' + ' ' + getBoxHostName()
 
-    elif fileExists('/etc/vtiversion.info'):
-        image = 'VTI'
     return image
 
+
 def getKernelVersionString():
     try:
         result = popen('uname -r', 'r').read().strip('\n').split('-')

NeoBoot/files/userscript.sh

@@ -0,0 +1,65 @@
+#!/bin/sh 
+# script gutosie 
+# here you can add your own command to perform
+# line - Checking internet connection by @j00zek thank you    
+
+IMAGEKATALOG=ImageBoot    
+
+if [ -e /.control_boot_new_image ] ; then
+    passwd -d root
+fi
+
+if [ ! -e `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ] ; then
+        mkdir `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` 
+        /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh  
+        echo "_(_________Start mountpoint location NEOBOOT_________)"          
+fi
+
+echo "_(Checking internet connection)..."
+ping -c 1 github.com 1>/dev/null 2>%1 
+if [ $? -gt 0 ]; then 
+      echo -n "_(github server unavailable, update impossible)\n!!! network restart...!!! )"       
+      /etc/init.d/networking stop; 
+	  echo "_____(stopping network connection)_____" 
+	  sleep 1; 
+	  /etc/init.d/networking start; 
+	  echo "_____(start network connection)_____" 	  
+	  sleep 5
+	  
+      if [ $? -gt 0 ]; then
+          if [ -e /usr/bin/curl ]; then
+              cd /tmp; curl -O --ftp-ssl https://raw.githubusercontent.com/gutosie/NeoBoot8/master/ver.txt; 
+              cd /
+          elif [ -e /usr/bin/wget ]; then
+              wget https://raw.githubusercontent.com/gutosie/NeoBoot8/master/ver.txt -O /tmp/ver.txt
+              cd /
+
+          fi
+          if [ ! -f /tmp/ver.txt ] ; then
+              /etc/init.d/networking stop; 
+			  echo "_____(stopping network connection)_____" 
+              sleep 2; 
+              /etc/init.d/networking start;
+			  echo "_____(start network connection)_____"
+			  
+          fi
+      fi
+
+      
+#      echo "        dns-nameservers 1.1.1.1 " >> /etc/network/interfaces     
+else
+    echo "_____!!!(github server available)!!!_____"  
+fi
+
+if [ -e /%1 ] ; then
+    rm -f /%1
+fi
+if [ -e /home/root/%1 ] ; then
+    rm -f /home/root/%1
+fi
+
+echo "!!!_____([NEOBOOT] used userscript)_____!!! "  
+echo ok 
+
+exit 0 
+