update 9.07

NeoBoot/bin/neoinitmips

@@ -0,0 +1,322 @@
+#!/bin/sh 
+#DESCRIPTION = This script mod. by gutosie
+#NeoBoot INIT Version: 6.00
+#Scrypt Unix Shell - init for neoboot 
+
+IMAGE=/media/neoboot/ImageBoot
+IMAGEBOOT=/media/neoboot/ImageBoot/.neonextboot
+NEO=/media/neoboot
+NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot
+MODPROBE=/sbin/modprobe
+BOXNAME=`cat /etc/hostname`
+FINDBOOT=/media/*/ImageBoot/.neonextboot
+
+
+if [ -e /tmp/.init_reboot ]; then
+          rm /tmp/.init_reboot
+	  break;
+
+else        
+	if [ -e $FINDBOOT ]  ; then 	    
+            CELBOOT=`cat $FINDBOOT`
+	    if [ $CELBOOT = "Flash" ]; then 
+                   exec /sbin/init.sysvinit $*	  
+                   exit 0
+            else
+                echo " "
+                break;
+            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
+	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
+	
+	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`
+	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 1
+        echo " "
+        echo "Search NEOBOOT... "
+        #sed=grep
+	mnttest="nouuid"
+	if [ -e $NEOBOOT/bin/install  ]; then
+        	orgimag1=`mount | grep '/sd/!d' | cut -d" " -f1`
+		selectinstall=`cat $NEOBOOT/bin/install`
+		for item in $orgimag1; do
+			selectmnt=`blkid | grep "/$selectinstall/!d" | cut -d":" -f1`
+			if [ $selectmnt == $item ]; then
+				echo "selectmnt=" $selectmnt
+                        	mnttest="uuid"
+				mount $selectmnt $NEO > /dev/null 2>&1
+			fi
+			if [ ! -e $IMAGE  ]; then
+				echo "NEOBOOT hasn't been installed on: " $selectmnt
+				umount $NEO > /dev/null 2>&1 
+			else                                
+				echo "NEOBOOT has been installed on: " $selectmnt
+				break;
+			fi 			
+		done
+	fi	
+
+	if [ ! -e $NEO  ]; then
+		mkdir $NEO > /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 $NEO  ]; then
+				echo "NEOBOOT checking installation on: " $DEVICE
+				mount $DEVICE $NEO > /dev/null 2>&1 
+			fi
+			if [ ! -e $IMAGE  ]; then
+				echo "NEOBOOT hasn't been installed on:" $DEVICE
+				umount $NEO > /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	
+
+        #dodatkowe szukanie neoboota
+        #mount /dev/sdb1 $NEO > /dev/null 2>&1  # <<< tu mozesz zmienic sdb1 i wpisac Twoje montowanie dysku dla neoboot
+
+        echo "NEOBOOT is loading modules."
+        for mod in dvb; do
+                  echo "=======================> NeoBoot is loading modules"
+              $MODPROBE $mod
+        done
+
+	if [ -f $LIBDIR/kernel/fs/autofs4/autofs4.ko ]; then
+		/sbin/insmod $LIBDIR/kernel/fs/autofs4/autofs4.ko > /dev/null 2>&1
+	fi
+		          
+        sleep 1
+
+	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 $NEOBOOT/bin/neobm ]; then
+            echo "  Neo-Boot start  boot manager  "
+            echo "  Waiting to change image - 20s "
+            echo " "
+	    chmod 0755 $NEOBOOT/bin/neobm
+	    $NEOBOOT/neologo.mvi > /dev/null 2>&1
+	    sleep 1
+	    $NEOBOOT/bin/neobm > /dev/null 2>&1
+	fi
+	
+	if [ ! -e $IMAGEBOOT ]; then
+		  ln -sfn /sbin/init.sysvinit /sbin/init
+                  echo "Flash "  > $IMAGEBOOT
+                  echo "Used Kernel: Reinstall kernel !"  > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel
+		  reboot -f
+	fi
+
+
+	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 $IMAGEBOOT ]; then
+        	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
+                echo "----------------------------------"
+	        echo "     BOOT UP IMAGE FROM FLASH     "
+                echo "----------------------------------"
+	else
+		        echo " " 
+		        echo "NEOBOOT is booting image" $TARGET " from " $DEVICE
+		        echo " " 
+		        if [ -d $IMAGE/$TARGET ]; then
+			        if [ -f $IMAGE/$TARGET/etc/init.d/udev ]; then
+				       sed -ei s!"\$4"!"\$3"!g $IMAGE/$TARGET/etc/init.d/udev
+			        fi
+
+			        if [ -f $IMAGE/$TARGET/usr/share/bootlogo.mvi ]; then
+				        /usr/bin/showiframe $IMAGE/$TARGET/usr/share/bootlogo.mvi > /dev/null 2>&1
+			        fi
+                                                			
+			        sleep 1
+
+			        /bin/mount -o bind /dev $IMAGE/$TARGET/dev
+			        /bin/mount -o bind /proc $IMAGE/$TARGET/proc
+			        /bin/mount -o bind /sys $IMAGE/$TARGET/sys
+			        rm $IMAGE/$TARGET/media/neoboot > /dev/null 2>&1
+			        mkdir $IMAGE/$TARGET/media/neoboot > /dev/null 2>&1
+                                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 == '$NEO' ]; then
+                                          echo $nhdd
+                                          echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                       else
+                                          echo "umount "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
+                                          echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
+                                       fi    
+                                   done	
+                           
+                                if [ -f $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh ]; then 
+                                    chmod 755 $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh	
+                                fi                                                                                                                              
+                                echo "----------------------------------------"
+	                        echo "   -=*[ BOOT UP IMAGE FROM DISK ]*=-    "
+                                echo "----------------------------------------"
+
+
+			        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 "Nie odnaleziono poprawnie rozpakowanego image "$TARGET" z partycji " $DEVICE
+                                    echo " Sprawdz poprawnosc rozpakowanych katalogow w wybranym image.              "
+                                    echo "                      Powrot do image Flash...                             "
+                                    rm -f $IMAGEBOOT; touch $IMAGEBOOT; echo "Flash "  >> $IMAGEBOOT 
+                                    /usr/bin/showiframe $NEOBOOT/error.mvi > /dev/null 2>&1
+                                    sync; sleep 10; exec /sbin/init.sysvinit $*
+
+                                fi
+			        exit 0
+
+		        fi
+	fi
+fi
+
+if [ -f /sbin/init.sysvinit ]; then                                
+                exec /sbin/init.sysvinit $*
+fi
+
+exit 0
+;;
+esac
+exit
+ 

NeoBoot/bin/neoinitmipsvu

@@ -0,0 +1,136 @@
+#!/bin/sh
+#script mod by gutosie
+IMAGE=/media/neoboot/ImageBoot
+IMAGEBOOT=/media/neoboot/ImageBoot/.neonextboot          
+NEO=/media/neoboot
+NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot
+MODPROBE=/sbin/modprobe
+BOXNAME=`cat /etc/hostname`
+FINDBOOT=/media/*/ImageBoot/.neonextboot
+CELBOOT=`cat $FINDBOOT`
+
+if [ $CELBOOT = "Flash" ] || [ -e /tmp/.init_reboot ] ; then 
+	exec /sbin/init.sysvinit $1	                               
+else         
+	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
+	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 $NEO > /dev/null 2>&1
+			fi
+			if [ ! -e $NEO/ImageBoot  ]; then
+				echo "NEOBOOT hasn't been installed on: " $selectmnt
+				umount $NEO > /dev/null 2>&1 
+			else
+				echo "NEOBOOT has been installed on: " $selectmnt
+				break;
+			fi 			
+		done
+	fi	
+	if [ ! -e $NEO  ]; then
+		mkdir $NEO > /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 $NEO  ]; then
+				echo "neoboot checking installation on: " $DEVICE
+				mount $DEVICE $NEO > /dev/null 2>&1 
+			fi
+
+			if [ ! -e $NEO/ImageBoot  ]; then
+				echo "NeoBoot hasn't been installed on: " $DEVICE
+				umount $NEO > /dev/null 2>&1 
+			else
+				echo "NEOBOOTt has been installed on: " $DEVICE
+				break;
+			fi 
+		done
+	elif [ $mnttest == "uuid" ]; then	
+		echo "NEOBOOT mount by UUID"
+	fi
+	if [ ! -e $IMAGEBOOT ]; then
+		  ln -sfn /sbin/init.sysvinit /sbin/init
+                  echo "Flash "  > $IMAGEBOOT
+                  echo "Used Kernel: Reinstall kernel !"  > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel
+		  reboot -f
+	fi    
+	TARGET=Flash
+	if [ -f $IMAGEBOOT ]; then
+	  TARGET=`cat $IMAGEBOOT`
+	fi	
+	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
+	else
+		echo "NEOBOOT is booting" $TARGET " from " $DEVICE
+                echo 3 > /proc/sys/vm/drop_caches
+		if [ -d $NEO/ImageBoot/$TARGET ]; then
+			if [ -f $NEO/ImageBoot/$TARGET/etc/init.d/udev ]; then
+				sed -ie s!"\$4"!"\$3"!g $NEO/ImageBoot/$TARGET/etc/init.d/udev
+			fi
+                	sleep 1		
+			/bin/mount -o bind /dev $NEO/ImageBoot/$TARGET/dev
+			/bin/mount -o bind /proc $NEO/ImageBoot/$TARGET/proc
+			/bin/mount -o bind /sys $NEO/ImageBoot/$TARGET/sys
+			rm $NEO/ImageBoot/$TARGET$NEO > /dev/null 2>&1
+			mkdir $NEO/ImageBoot/$TARGET$NEO > /dev/null 2>&1
+                        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 == '$NEO' ]; then
+                                  echo $nhdd
+                                  echo "mkdir "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
+                                  echo "mount "$item $nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh 
+                               else
+                                  echo "umount "$nhdd  >> $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh
+                                  echo "mkdir "$nhdd  >> $IMAGE/$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 $IMAGE/$TARGET/usr/bin/enigma2_pre_start.sh   
+
+			if [ -f $IMAGE/$TARGET/sbin/init.sysvinit ]; then                                    
+                                    exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init.sysvinit 
+			elif [ -f $IMAGE/$TARGET/sbin/init ]; then                                    
+                                    exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init        
+			else
+                                    echo " "
+                                    echo "                       NEOBOOT - ERROR !!!                                 "
+                                    echo "Nie odnaleziono poprawnie rozpakowanego image "$TARGET" z partycji " $DEVICE
+                                    echo " Sprawdz poprawnosc rozpakowanych katalogow w wybranym image.              "
+                                    echo "                      Powrot do image Flash...                             "
+                                    rm -f $IMAGEBOOT; touch $IMAGEBOOT; echo "Flash "  >> $IMAGEBOOT 
+                                    sync; sleep 10; exec /sbin/init.sysvinit $1
+			fi
+			exit 0
+		fi
+	fi
+fi
+if [ -f /sbin/init.sysvinit ]; then
+		exec /sbin/init.sysvinit $1
+fi
+
+exit 0

NeoBoot/extract.py

@@ -245,11 +245,11 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan
 
         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)
@@ -406,13 +406,17 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Lan
 
         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 = '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)):
@@ -644,7 +648,9 @@ def RemoveUnpackDirs():
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/sf4008'):
         rc = os.system('rm -r ' + getNeoLocation() + 'ImagesUpload/sf4008')
     elif os.path.exists('' + getNeoLocation() + 'ImagesUpload/osmio4k'):
-        rc = os.system('rm -r ' + 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'):
@@ -1193,6 +1199,10 @@ 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 -jxf ' + getNeoLocation() + 'ImagesUpload/dm900/rootfs.tar.bz2 -C ' + getNeoLocation() + 'ImageBoot/' + target + ' > /dev/null 2>&1'

NeoBoot/files/stbbranding.py

@@ -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'

NeoBoot/files/tools.py

@@ -22,7 +22,7 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE,
 from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen
 from os.path import dirname, isdir, isdir as os_isdir
 from enigma import eTimer
-from stbbranding import getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC
+from stbbranding import getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC, getImageATv 
 import os
 import time
 import sys
@@ -55,8 +55,8 @@ def getKernelVersion():
     try:
         return open('/proc/version', 'r').read().split(' ', 4)[2].split('-', 2)[0]
     except:
-        return _('unknown')
-            
+        return _('unknown')            
+
 def getCPUtype():
     cpu='UNKNOWN'
     if os.path.exists('/proc/cpuinfo'):
@@ -189,11 +189,15 @@ class MBTools(Screen):
         self.list.append (res)
         self ['list']. list = self.list
 
-        res = (_ ('Supported sat tuners'), png, 16)
+        res = (_ ('Add cams to feed for OpenATV '), png, 16)
         self.list.append (res)
         self ['list']. list = self.list
 
-        res = (_ ('NeoBoot Information'), png, 17)
+        res = (_ ('Supported sat tuners'), png, 17)
+        self.list.append (res)
+        self ['list']. list = self.list
+
+        res = (_ ('NeoBoot Information'), png, 18)
         self.list.append (res)
         self ['list']. list = self.list
 
@@ -234,9 +238,11 @@ class MBTools(Screen):
             pass
         if self.sel == 15 and self.session.open(DeletingLanguages):               
             pass
-        if self.sel == 16 and self.session.open(TunerInfo):
+        if self.sel == 16 and self.session.open(ATVcamfeed):               
             pass
-        if self.sel == 17 and self.session.open(MultiBootMyHelp):
+        if self.sel == 17 and self.session.open(TunerInfo):
+            pass
+        if self.sel == 18 and self.session.open(MultiBootMyHelp):
             pass
 
 class MBBackup(Screen):
@@ -1431,6 +1437,35 @@ class DeletingLanguages(Screen):
             self.close()
 
 
+class ATVcamfeed(Screen):
+    __module__ = __name__
+    skin = """<screen name="ATV add cam feed" title="Password change" position="center,center" size="700,300" flags="wfNoBorder">
+        <widget name="lab1" position="20,20" size="660,210" font="baslk;25" halign="center" valign="center" transparent="1" />
+        <ePixmap position="200,250" size="34,34" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/images/red.png" alphatest="blend" zPosition="1" />
+        <widget name="key_red" position="250,250" zPosition="2" size="280,35" font="baslk;30" halign="left" valign="center" backgroundColor="red" transparent="1" foregroundColor="red" />
+        </screen>"""
+
+    def __init__(self, session):
+        Screen.__init__(self, session)
+        self['lab1'] = Label(_('Add Cam dowloand from feed.'))
+        self['key_red'] = Label(_('Start'))
+        self['actions'] = ActionMap(['WizardActions', 'ColorActions'], {'back': self.close,
+         'red': self.addcamatv})
+
+    def addcamatv(self):
+        if getImageATv() == 'okfeedCAMatv':           
+            cmd = "echo -e '\n\n%s '" % _('NeoBoot - ATV add cam feed ...')
+            cmd1 = 'wget -O - -q http://updates.mynonpublic.com/oea/feed | bash' 
+            self.session.open(Console, _('NeoBoot: Cams feed add...'), [cmd, cmd1])
+
+        elif getImageATv() != 'okfeedCAMatv': 
+            self.myClose(_('Sorry, is not image Open ATV !!!'))
+
+    def myClose(self, message):
+        self.session.open(MessageBox, message, MessageBox.TYPE_INFO)
+        self.close()
+        
+        
 class TunerInfo(Screen):
     __module__ = __name__
     skin = """<screen name="TunerInfo" title="NeoBoot - Sat Tuners " position="center,center" size="700,300" flags="wfNoBorder">

NeoBoot/files/userscript.sh

@@ -3,7 +3,11 @@
 # here you can add your own command to perform
 # line - Checking internet connection by @j00zek thank you    
 
-IMAGEKATALOG=ImageBoot                
+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` 
@@ -41,17 +45,21 @@ if [ $? -gt 0 ]; then
           fi
       fi
 
-      if [ -e /%1 ] ; then
-         rm -f /%1                
-      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 
-                                             
+                                             

NeoBoot/plugin.py

@@ -50,8 +50,8 @@ if fileExists('/etc/vtiversion.info') and fileExists('/.multinfo'):
 else:
     from files.neoconsole import Console
     
-PLUGINVERSION = '9.02'
-UPDATEVERSION = '9.03'    
+PLUGINVERSION = '9.03'
+UPDATEVERSION = '9.07'    
 LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'    
 
 try:
@@ -539,9 +539,9 @@ class NeoBootInstallation(Screen):
                             os.system('opkg install mtd-utils')
                 if os.system('opkg list-installed | grep mtd-utils-ubifs') != 0:                                                                                                                                                                                                                                                                                                                                                
                             os.system('opkg install mtd-utils-ubifs')
-
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
             # ARM - OctagonSF4008 - DM900 - Zgemma h7S - Octagon sf 8008 - AX HD60 4K  #gbquad4k  arm , #osmio4k  arm, #Zgemma h9  arm, #Zgemma h7S  arm , #Octagon SF4008         
-            if getBoxHostName() == 'ustym4kpro' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' or getBoxHostName() == 'ax51' or getBoxHostName() == 'tmtwin4k' or getBoxHostName() == 'anadol4k' or getBoxHostName() == 'protek4k' or getBoxHostName() == 'maxytecmulti' or getBoxHostName() == 'force3uhd' or getBoxHostName() == 'viper4k' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'h10' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251'  or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuuno4k' and getBoxHostName() != 'vusolo4k' and getBoxHostName() != 'vuuno4kse' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuduo4k' and getBoxHostName() != 'vuzero4k':
+            if getBoxHostName() == 'ustym4kpro' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7' or getBoxHostName() == 'zgemmah7' or getBoxHostName() == 'ax51' or getBoxHostName() == 'tmtwin4k' or getBoxHostName() == 'anadol4k' or getBoxHostName() == 'protek4k' or getBoxHostName() == 'maxytecmulti' or getBoxHostName() == 'force3uhd' or getBoxHostName() == 'viper4k' or getBoxHostName() == 'dm920' or getBoxHostName() == 'et1x000' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getBoxHostName == 'osmio4k' or getBoxHostName == 'osmio4kplus' or getBoxHostName() == 'zgemmah9s' or getBoxHostName() == 'h9combo' or getBoxHostName() == 'h10' or getBoxHostName() == 'ax60' or getBoxHostName() == 'sf8008' or getCPUSoC() == 'bcm7251'  or getCPUSoC() == 'BCM97252SSFF' or getBoxHostName() == 'dm900' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuuno4k' and getBoxHostName() != 'vusolo4k' and getBoxHostName() != 'vuuno4kse' and getBoxHostName() != 'vuultimo4k' and getBoxHostName() != 'vuduo4k' and getBoxHostName() != 'vuzero4k':
                         os.system('cp -f ' + LinkNeoBoot + '/bin/neoinitarm /sbin/neoinitarm; chmod 0755 /sbin/neoinitarm; ln -sfn /sbin/neoinitarm /sbin/init; mv ' + LinkNeoBoot + '/tmpfiles/runpy/arm_run.py ' + LinkNeoBoot + '/run.py; cd')                                                                          
             #VUPLUS ARM 
             elif getCPUtype() == 'ARMv7' and getBoxHostName() !=  'ustym4kpro':
@@ -802,7 +802,7 @@ class NeoBootImageChoose(Screen):
 
             if not fileExists('/.control_ok'):
                 if fileExists('/.control_boot_new_image'):  
-                    os.system('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh; rm -f /.control_boot_new_image; echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file."  > /.control_ok ')          
+                    os.system('rm -f /.control_boot_new_image; echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file."  > /.control_ok ')          
                 if not fileExists('/.control_boot_new_image'):  
                     os.system('echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file."  > /.control_ok')
                         
@@ -1235,6 +1235,7 @@ class NeoBootImageChoose(Screen):
              'h9combo',
              'h10',             
              'osmio4k',
+             'osmio4kplus',
              'bcm7252s',
              'gbquad4k', 
              'ax60',

NeoBoot/tmpfiles/runpy/arm_run.py

@@ -156,6 +156,7 @@ class StartImage(Screen):
                                                                                          
             #ARM procesor: DM900; AX HD60 4K                      
             if getCPUtype() == 'ARMv7' and getCPUSoC() or getBoxHostName() == ['osmio4k', 
+             'osmio4kplus',                                                                 
              'ax60',
              'sf8008', 
              'bcm7251',

NeoBoot/tmpfiles/runpy/vu_mtd2_run.py

@@ -131,7 +131,7 @@ class StartImage(Screen):
                                 elif fileExists('/.multinfo'):    
                                     if not fileExists('%sImageBoot/%s/boot/%s.vmlinux.gz' % ( getNeoLocation(), getImageNeoBoot(), getBoxHostName())):
                                         cmd = 'flash_eraseall /dev/mtd2; sleep 2; nandwrite -p /dev/mtd2 %sImagesUpload/.kernel/%s.vmlinux.gz; /etc/init.d/reboot' % getNeoLocation(), getBoxHostName()
-                                    elif fileExists('%sImageBoot/%s/boot/%s.vmlinux.gz' % ( getImageNeoBoot(), getBoxHostName())):
+                                    elif fileExists('%sImageBoot/%s/boot/%s.vmlinux.gz' % ( getNeoLocation(), getImageNeoBoot(), getBoxHostName())):
                                         cmd = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/kernel.sh'
 
                             self.session.open(Console, _('NeoBoot MIPS....'), [cmd])

ver.txt

@@ -1,2 +1,2 @@
-9.03
+9.07