diff --git a/NeoBoot/bin/neoinitarmvu b/NeoBoot/bin/neoinitarmvu index ca0648e..0eaf312 100644 --- a/NeoBoot/bin/neoinitarmvu +++ b/NeoBoot/bin/neoinitarmvu @@ -2,8 +2,7 @@ #script mod by gutosie #neo init arm -NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` -INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` +NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot HOSTNAME=`cat /etc/hostname` @@ -202,20 +201,11 @@ else /usr/lib/enigma2/python/Plugins/Extensions/NFR4XBoot/bin/fbclear > /dev/null 2>&1 fi - - HARDWARETYPE=`uname -m` + + HARDWARETYPE=`uname -m` if [ $NEODEVICE = "/media/hdd/" ]; then /bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - fi - #if [ $NEODEVICE = "/media/hdd/" ] && [ $INSTALLDEVICE = "/dev/sda1" ] ; then - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #fi - #if [ $NEODEVICE = "/media/usb/" ] && [ $INSTALLDEVICE = "/dev/sdb1" ] ; then - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - #fi - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - + fi if [ $TARGET = "Flash" ]; then echo "NEOBOOT is booting image from " $TARGET /bin/umount /media/usb > /dev/null 2>&1 @@ -319,10 +309,6 @@ else echo " start file - init.sysvinit" >> $neoLOG exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init echo "====================================================> " - elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/lib/systemd/systemd ]; then - echo " start file - systemd" >> $neoLOG - exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /lib/systemd/systemd - echo "====================================================> " else echo " NEOBOOT - ERROR !!! " echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE @@ -335,8 +321,7 @@ else /bin/umount /media/hdd > /dev/null 2>&1 echo -n " FATAL ERROR - Back to image Flash...\n<<>>" >> $neoLOG echo -n "<<>>" - ln -sfn /sbin/init.sysvinit /sbin/init - sleep 20 + ln -sfn /sbin/init.sysvinit /sbin/init reboot -d -f fi diff --git a/NeoBoot/bin/neoinitmips b/NeoBoot/bin/neoinitmips index 1439562..562c96f 100644 --- a/NeoBoot/bin/neoinitmips +++ b/NeoBoot/bin/neoinitmips @@ -5,7 +5,6 @@ NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot MODPROBE=/sbin/modprobe NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` -INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` IMAGEKATALOG=ImageBoot UPLOAD=ImagesUpload HOSTNAME=`cat /etc/hostname` @@ -207,16 +206,7 @@ else TARGET=Flash if [ $NEODEVICE = "/media/hdd/" ]; then /bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - fi - #if [ $NEODEVICE = "/media/hdd/" ] && [ $INSTALLDEVICE = "/dev/sda1" ] ; then - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #fi - #if [ $NEODEVICE = "/media/usb/" ] && [ $INSTALLDEVICE = "/dev/sdb1" ] ; then - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - #fi - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - + fi if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi @@ -311,10 +301,6 @@ else echo " start file - init.sysvinit" >> $neoLOG exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init echo "====================================================> " - elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/lib/systemd/systemd ]; then - echo " start file - init.sysvinit" >> $neoLOG - exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /lib/systemd/systemd - echo "====================================================> " else echo " NEOBOOT - ERROR !!! " echo "Not found correctly unpacked image "$TARGET" z partycji " $DEVICE @@ -329,7 +315,6 @@ else echo -n "END INIT INFO Rebooting..." ln -sfn /sbin/init.sysvinit /sbin/init echo "====================================================> " - sleep 20 reboot -f fi exit 0 diff --git a/NeoBoot/bin/neoinitmips_vu b/NeoBoot/bin/neoinitmips_vu index 5cb9a5a..6b1f56f 100644 --- a/NeoBoot/bin/neoinitmips_vu +++ b/NeoBoot/bin/neoinitmips_vu @@ -4,7 +4,6 @@ IMAGE=/media/neoboot/ImageBoot IMAGEBOOT=/media/neoboot/ImageBoot/.neonextboot NEO=/media/neoboot NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot -INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` MODPROBE=/sbin/modprobe BOXNAME=`cat /etc/hostname` FINDBOOT=/media/*/ImageBoot/.neonextboot @@ -72,19 +71,7 @@ else echo "Flash " > $IMAGEBOOT echo "Used Kernel: Reinstall kernel !" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel reboot -f - fi - if [ $NEODEVICE = "/media/hdd/" ]; then - /bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - fi - #if [ $NEODEVICE = "/media/hdd/" ] && [ $INSTALLDEVICE = "/dev/sda1" ] ; then - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #fi - #if [ $NEODEVICE = "/media/usb/" ] && [ $INSTALLDEVICE = "/dev/sdb1" ] ; then - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - #fi - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - + fi TARGET=Flash if [ -f $IMAGEBOOT ]; then TARGET=`cat $IMAGEBOOT` @@ -128,11 +115,7 @@ else 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 - elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/lib/systemd/systemd ]; then - echo " start file - init.sysvinit" >> $neoLOG - exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /lib/systemd/systemd - echo "====================================================> " + exec /usr/sbin/chroot $IMAGE/$TARGET /sbin/init else echo " " echo " NEOBOOT - ERROR !!! " diff --git a/NeoBoot/bin/neoinitmipsvu b/NeoBoot/bin/neoinitmipsvu index 0480771..1f987f0 100644 --- a/NeoBoot/bin/neoinitmipsvu +++ b/NeoBoot/bin/neoinitmipsvu @@ -2,8 +2,7 @@ #script mod by gutosie #neo init mips -NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` -INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` +NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot @@ -173,15 +172,7 @@ else TARGET=Flash if [ $NEODEVICE = "/media/hdd/" ]; then /bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - fi - #if [ $NEODEVICE = "/media/hdd/" ] && [ $INSTALLDEVICE = "/dev/sda1" ] ; then - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #fi - #if [ $NEODEVICE = "/media/usb/" ] && [ $INSTALLDEVICE = "/dev/sdb1" ] ; then - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 - #fi - #/bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 - #/bin/mount /dev/sdb1 /media/usb > /dev/null 2>&1 + fi if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi @@ -250,11 +241,7 @@ else 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 - elif [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/lib/systemd/systemd ]; then - echo " start file - systemd" >> $neoLOG - exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /lib/systemd/systemd - echo "====================================================> " + exec /usr/sbin/chroot `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET /sbin/init else echo " " echo " NEOBOOT - ERROR !!! "