From b6e7316cc67432e87680b9554600eeab03634330 Mon Sep 17 00:00:00 2001 From: gutosie Date: Wed, 17 Feb 2021 22:43:46 +0200 Subject: [PATCH] Add files via upload --- NeoBoot/bin/neoinitmips | 31 ++++++++----------------------- NeoBoot/bin/neoinitmipsvu | 24 +++++------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/NeoBoot/bin/neoinitmips b/NeoBoot/bin/neoinitmips index d7f445f..f565472 100644 --- a/NeoBoot/bin/neoinitmips +++ b/NeoBoot/bin/neoinitmips @@ -1,11 +1,12 @@ #!/bin/sh #DESCRIPTION = This script mod. by gutosie -#NeoBoot INIT Version: 9.12 vip +#NeoBoot INIT Version: NEOBOOT VIP MIPS #Scrypt Unix Shell - init for neoboot NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot MODPROBE=/sbin/modprobe NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot +UPLOAD=ImagesUpload HOSTNAME=`cat /etc/hostname` echo "====================================================> " echo " " @@ -44,13 +45,14 @@ else mknod /dev/fb0 c 29 0 mkdir /dev/fb ln -s ../fb0 /dev/fb/0 + echo "====================================================> " 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 -a + /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 @@ -119,7 +121,6 @@ else umount $NEODEVICE > /dev/null 2>&1 fi done - #dodatkowe szukanie neoboota #mount /dev/sdb1 $NEODEVICE > /dev/null 2>&1 # <<< tu mozesz zmienic sdb1 i wpisac Twoje montowanie dysku dla neoboot if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then if [ -e /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh ]; then @@ -183,7 +184,7 @@ else ln -sfn /sbin/init.sysvinit /sbin/init /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1 echo "Flash " > $NEODEVICE$IMAGEKATALOG/.neonextboot - echo "Used Kernel: Reinstall kernel !" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel + echo "Used Kernel: Reinstall kernel !" > $NEODEVICE$$UPLOAD/.kernel/used_flash_kernel echo " Sending all processes the TERM- KILL signal..." echo -n "<<>>" echo " Sending all processes the TERM- KILL signal..." >> $neoLOG @@ -192,21 +193,6 @@ else /bin/umount /media/hdd > /dev/null 2>&1 reboot -f fi - TARGETIMAGE=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` - if [ $TARGETIMAGE = "BlackHoleVU" ] || [ $TARGETIMAGE = "BlackHoleVU+" ] ; then - if ! [ -e $NEODEVICE$IMAGEKATALOG/.kernel/used_bh_kernel ]; then - rm -f $NEODEVICE$IMAGEKATALOG/.neonextboot - echo "Flash " >> $NEODEVICE$IMAGEKATALOG/.neonextboot - echo "Halt init image - " $TARGETIMAGE - echo "Start image Flash... " - /usr/bin/showiframe $NEOBOOT/bh.mvi > /dev/null 2>&1 - sleep 1 - exec /sbin/init.sysvinit $* - exit 0 - else - break; - fi - fi TARGET=Flash if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` @@ -268,9 +254,6 @@ else /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 - if [ $HOSTNAME = "vuultimo4k" ] || [ $HOSTNAME = "vusolo4k" ] || [ $HOSTNAME = "vuuno4kse" ] || [ $HOSTNAME = "vuuno4k" ]; then - break; - else orgimag=`mount | sed '/sd/!d' | cut -d" " -f1` rm -f $NEODEVICE$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh for item in $orgimag; do @@ -283,11 +266,12 @@ else done chmod 755 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/usr/bin/enigma2_pre_start.sh echo "NeoBOOT created the file enigma2_pre_start.sh " + echo "====================================================> " 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 #nie powinno sie zdarzyc fi - fi echo " [NEOBOOT] Use chroot ... exec /usr/sbin/chroot..." + echo "====================================================> " cp -f -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh $NEODEVICE$IMAGEKATALOG/$TARGET/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh #/bin/mount /dev/sda1 `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$TARGET/media/hdd if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/sbin/init ]; then @@ -316,6 +300,7 @@ else echo -n " FATAL ERROR - Back to image Flash...\n<<>>" >> $neoLOG echo -n "<<>>" ln -sfn /sbin/init.sysvinit /sbin/init + echo "====================================================> " reboot -d -f fi exit 0 diff --git a/NeoBoot/bin/neoinitmipsvu b/NeoBoot/bin/neoinitmipsvu index 13450da..51e02bc 100644 --- a/NeoBoot/bin/neoinitmipsvu +++ b/NeoBoot/bin/neoinitmipsvu @@ -6,6 +6,7 @@ NEOBOOT=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot MODPROBE=/sbin/modprobe NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` IMAGEKATALOG=ImageBoot +UPLOAD=ImagesUpload HOSTNAME=`cat /etc/hostname` echo "====================================================> " echo " " @@ -55,7 +56,6 @@ else /sbin/depmod -Ae > /dev/null 2>&1 fi sleep 2 - /usr/bin/showiframe $NEOBOOT/neologo.mvi > /dev/null 2>&1 mnttest="nouuid" if [ -e $NEOBOOT/bin/install ]; then orgimag1=`mount | sed '/sd/!d' | cut -d" " -f1` @@ -119,9 +119,8 @@ else echo "Init image, base kernel: " `cat $NEODEVICE$IMAGEKATALOG/.neonextboot` >> $neoLOG if [ ! -e $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then ln -sfn /sbin/init.sysvinit /sbin/init - /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1 echo "Flash " > $NEODEVICE$IMAGEKATALOG/.neonextboot - echo "Used Kernel: Reinstall kernel !" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel + echo "Used Kernel: Reinstall kernel !" > $NEODEVICE$$UPLOAD/.kernel/used_flash_kernel echo " Sending all processes the TERM- KILL signal..." echo -n "<<>>" echo " Sending all processes the TERM- KILL signal..." >> $neoLOG @@ -134,16 +133,11 @@ else if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi - #TARGET=Flash - HARDWARETYPE=`uname -m` if [ $TARGET = "Flash" ]; then echo "NEOBOOT is booting image from " $TARGET echo " BOOT UP IMAGE FROM FLASH " >> $neoLOG /bin/umount /media/usb > /dev/null 2>&1 /bin/umount /media/hdd > /dev/null 2>&1 - if [ $HARDWARETYPE != "armv7l" ]; then - /usr/bin/showiframe /usr/share/bootlogo.mvi > /dev/null 2>&1 - fi echo "----------------------------------" echo " BOOT UP IMAGE FROM FLASH " echo "----------------------------------"; @@ -161,14 +155,14 @@ else rm -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_boot_new_image > /dev/null 2>&1 else if [ ! -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/$TARGET/.control_ok ] ; then - /usr/bin/showiframe /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/error.mvi > /dev/null 2>&1 echo " Wrong kernel. FATAL ERROR - Back to image Flash..." >> $neoLOG 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 - /bin/umount /media/usb > /dev/null 2>&1 - /bin/umount /media/hdd > /dev/null 2>&1 + /bin/umount /media/usb > /dev/null 2>&1 + /bin/umount /media/hdd > /dev/null 2>&1 echo -n "<<>>" + sleep 5 reboot -d -f fi fi @@ -178,13 +172,6 @@ else 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 [ $HARDWARETYPE != "armv7l" ]; then - 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 - fi sleep 1 /bin/mount -o bind /dev $NEODEVICE$IMAGEKATALOG/$TARGET/dev /bin/mount -o bind /proc $NEODEVICE$IMAGEKATALOG/$TARGET/proc @@ -231,7 +218,6 @@ else 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 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 /bin/umount /media/usb > /dev/null 2>&1