From bd27c935592b9d9b10d3519a2c5141e362ab90dd Mon Sep 17 00:00:00 2001 From: gutosie Date: Wed, 21 Dec 2022 13:20:20 +0200 Subject: [PATCH] Add files via upload --- NeoBoot/bin/dminit | 16 ++++++++++------ NeoBoot/bin/neoinitarmvuDuo4k | 7 ++++--- NeoBoot/bin/neoinitmips | 9 ++++++++- NeoBoot/bin/neoinitmips_vu | 13 ++++++++++++- NeoBoot/bin/neoinitmipsvu | 10 ++++++++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/NeoBoot/bin/dminit b/NeoBoot/bin/dminit index fd28dd0..33f805f 100644 --- a/NeoBoot/bin/dminit +++ b/NeoBoot/bin/dminit @@ -1,5 +1,6 @@ #!/bin/sh -NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` IMAGEKATALOG=ImageBoot HOSTNAME=`cat /etc/hostname` if [ -e /tmp/.init_reboot ]; then @@ -167,12 +168,15 @@ else break; fi TARGET=Flash - if [ $NEODEVICE = "/media/hdd/" ]; then - mount /dev/sda1 /media/hdd > /dev/null 2>&1 - fi - if [ $NEODEVICE = "/media/usb/" ]; then - mount /dev/sda1 /media/usb > /dev/null 2>&1 + 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 + if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi diff --git a/NeoBoot/bin/neoinitarmvuDuo4k b/NeoBoot/bin/neoinitarmvuDuo4k index f22c17b..6dc8e7f 100644 --- a/NeoBoot/bin/neoinitarmvuDuo4k +++ b/NeoBoot/bin/neoinitarmvuDuo4k @@ -11,7 +11,8 @@ echo " " echo "====================================================> " -NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` IMAGEKATALOG=ImageBoot HOSTNAME=`cat /etc/hostname` @@ -166,10 +167,10 @@ else ###>>>>>>>>>>>>>>>>> UPLOAD=ImagesUpload - if [ $NEODEVICE = "/media/hdd/" ]; then + if [ $NEODEVICE = "/media/hdd/" ] && [ $INSTALLDEVICE = "/dev/sda1" ] ; then /bin/mount /dev/sda1 /media/hdd > /dev/null 2>&1 fi - if [ $NEODEVICE = "/media/usb/" ]; then + 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 diff --git a/NeoBoot/bin/neoinitmips b/NeoBoot/bin/neoinitmips index bbf89ae..1319010 100644 --- a/NeoBoot/bin/neoinitmips +++ b/NeoBoot/bin/neoinitmips @@ -5,6 +5,7 @@ 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` @@ -204,9 +205,15 @@ else break; fi TARGET=Flash - if [ $NEODEVICE = "/media/hdd/" ]; then + 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 + if [ -f $NEODEVICE$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi diff --git a/NeoBoot/bin/neoinitmips_vu b/NeoBoot/bin/neoinitmips_vu index 099d9af..9493f36 100644 --- a/NeoBoot/bin/neoinitmips_vu +++ b/NeoBoot/bin/neoinitmips_vu @@ -4,6 +4,7 @@ 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 @@ -71,7 +72,17 @@ else echo "Flash " > $IMAGEBOOT echo "Used Kernel: Reinstall kernel !" > /media/neoboot/ImagesUpload/.kernel/used_flash_kernel reboot -f - fi + 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 + TARGET=Flash if [ -f $IMAGEBOOT ]; then TARGET=`cat $IMAGEBOOT` diff --git a/NeoBoot/bin/neoinitmipsvu b/NeoBoot/bin/neoinitmipsvu index daea973..8b4adc4 100644 --- a/NeoBoot/bin/neoinitmipsvu +++ b/NeoBoot/bin/neoinitmipsvu @@ -2,7 +2,8 @@ #script mod by gutosie #neo init mips -NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +NEODEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location` +INSTALLDEVICE=`cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install` IMAGEKATALOG=ImageBoot @@ -170,9 +171,14 @@ else TARGET=Flash - if [ $NEODEVICE = "/media/hdd/" ]; then + 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 if [ -f `cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location`$IMAGEKATALOG/.neonextboot ]; then TARGET=`cat $NEODEVICE$IMAGEKATALOG/.neonextboot` fi