diff --git a/NeoBoot/tmpfiles/target/vuDuo4Kmmcblk0p6.sh b/NeoBoot/tmpfiles/target/vuDuo4Kmmcblk0p6.sh index 891dae9..66835d7 100644 --- a/NeoBoot/tmpfiles/target/vuDuo4Kmmcblk0p6.sh +++ b/NeoBoot/tmpfiles/target/vuDuo4Kmmcblk0p6.sh @@ -28,7 +28,6 @@ NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload MOUNTneoDisk=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install) -MOUNTblkid=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid) MOUNTMEDIA=$( ls /media) if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then @@ -110,9 +109,6 @@ if [ $VUMODEL = "duo4k" ] ; then echo "Neoboot location: " echo ""$MOUNTneoDisk" " sleep 1 - echo "Info media: " - echo ""$MOUNTblkid" " - sleep 1 echo "Media list: " echo ""$MOUNTMEDIA" " sleep 1 diff --git a/NeoBoot/tmpfiles/target/vuDuo4Ksemmcblk0p6.sh b/NeoBoot/tmpfiles/target/vuDuo4Ksemmcblk0p6.sh index 35de90c..c5d2b2c 100644 --- a/NeoBoot/tmpfiles/target/vuDuo4Ksemmcblk0p6.sh +++ b/NeoBoot/tmpfiles/target/vuDuo4Ksemmcblk0p6.sh @@ -28,7 +28,6 @@ NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload MOUNTneoDisk=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install) -MOUNTblkid=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid) MOUNTMEDIA=$( ls /media) if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then @@ -110,9 +109,6 @@ if [ $VUMODEL = "duo4kse" ] ; then echo "Neoboot location: " echo ""$MOUNTneoDisk" " sleep 1 - echo "Info media: " - echo ""$MOUNTblkid" " - sleep 1 echo "Media list: " echo ""$MOUNTMEDIA" " sleep 1 diff --git a/NeoBoot/tmpfiles/target/vuZero4Kmmcblk0p4.sh b/NeoBoot/tmpfiles/target/vuZero4Kmmcblk0p4.sh index a680880..c202f8f 100644 --- a/NeoBoot/tmpfiles/target/vuZero4Kmmcblk0p4.sh +++ b/NeoBoot/tmpfiles/target/vuZero4Kmmcblk0p4.sh @@ -28,7 +28,6 @@ NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload MOUNTneoDisk=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install) -MOUNTblkid=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid) MOUNTMEDIA=$( ls /media) if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then @@ -115,9 +114,6 @@ if [ $VUMODEL = "zero4k" ] ; then echo "Neoboot location: " echo ""$MOUNTneoDisk" " sleep 1 - echo "Info media: " - echo ""$MOUNTblkid" " - sleep 1 echo "Media list: " echo ""$MOUNTMEDIA" " sleep 1 diff --git a/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh b/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh index 03f5422..40fe61a 100644 --- a/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh +++ b/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh @@ -31,7 +31,6 @@ NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload NandWrite=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot//bin/nandwrite -#nandwrite -p /dev/mtd1 /media/hdd/ImagesUpload/.kernel/vusolo.vmlinux.gz if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then TARGET=`cat $NEOBOOTMOUNT$IMAGENEXTBOOT` @@ -49,9 +48,9 @@ if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] | sleep 2 flash_eraseall /dev/mtd1 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to /dev/mtd1" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to from /dev/mtd1" sleep 2 - $NandWrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz > /dev/null 2>&1 + $NandWrite -p /dev/mtd1 /media/hdd/.kernel/vusolo.vmlinux.gz > /dev/null 2>&1 fi fi update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -65,7 +64,7 @@ if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] | [ $PL ] && echo "Kasowanie kernel z /dev/mtd1..." || echo "Erase kernel from /dev/mtd1" sleep 2 flash_eraseall /dev/mtd1 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to /dev/mtd1" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to from /dev/mtd1" sleep 2 $NandWrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz > /dev/null 2>&1 fi @@ -84,12 +83,12 @@ if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] | if [ -e /.multinfo ] ; then INFOBOOT=$( cat /.multinfo ) if [ $TARGET = $INFOBOOT ] ; then - echo "NEOBOOT is booting image " $TARGET + echo "NEOBOOT is booting image from " $TARGET else [ $PL ] && echo "Kasowanie kernel z /dev/mtd1..." || echo "Erase kernel from /dev/mtd1" sleep 2 flash_eraseall /dev/mtd1 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to /dev/mtd1" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to from /dev/mtd1" sleep 2 $NandWrite -p /dev/mtd1 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz > /dev/null 2>&1 update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -100,7 +99,7 @@ if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] | [ $PL ] && echo "Kasowanie kernel z /dev/mtd1..." || echo "Erase kernel from /dev/mtd1" sleep 2 flash_eraseall /dev/mtd1 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to /dev/mtd1" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd1..." || echo "Writing kernel to from /dev/mtd1" sleep 2 $NandWrite -p /dev/mtd1 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz > /dev/null 2>&1 update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -115,7 +114,6 @@ if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] | fi else break; - fi else ln -sfn /sbin/init.sysvinit /sbin/init echo "CHIPSET: " $CHIPSET " BOXNAME: "$BOXNAME" MODEL: "$VUMODEL" " diff --git a/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh b/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh index f305318..1141291 100644 --- a/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh +++ b/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh @@ -24,10 +24,10 @@ if [ -f /tmp/zImage ]; then rm -f /tmp/zImage fi -KERNEL=`uname -r` +KERNEL=`uname -r` IMAGE=ImageBoot IMAGENEXTBOOT=/ImageBoot/.neonextboot -NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) +NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload NandWrite=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot//bin/nandwrite @@ -35,21 +35,22 @@ NandWrite=/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot//bin/nandwrite if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then TARGET=`cat $NEOBOOTMOUNT$IMAGENEXTBOOT` else - TARGET=Flash + TARGET=Flash fi - + if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolose" ] || [ $BOXNAME = "vuzero" ]; then #[ $BOXNAME = "mbultra" ] if [ -f /proc/stb/info/vumodel ] || [ ! -e /proc/stb/info/boxtype ] ; then - if [ $TARGET = "Flash" ]; then - if [ -e /.multinfo ]; then + if [ $TARGET = "Flash" ]; then + if [ -e /.multinfo ]; then if [ -f /proc/stb/info/vumodel ] || [ ! -e /proc/stb/info/boxtype ]; then if [ -e $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz ] ; then [ $PL ] && echo "Kasowanie kernel z /dev/mtd2..." || echo "Erase kernel from /dev/mtd2" + sleep 2 flash_eraseall /dev/mtd2 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to /dev/mtd2" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to from /dev/mtd2" sleep 2 - $NandWrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz > /dev/null 2>&1 + $NandWrite -p /dev/mtd2 /media/hdd/.kernel/vusolo.vmlinux.gz > /dev/null 2>&1 fi fi update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -63,7 +64,7 @@ if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolos [ $PL ] && echo "Kasowanie kernel z /dev/mtd2..." || echo "Erase kernel from /dev/mtd2" sleep 2 flash_eraseall /dev/mtd2 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to /dev/mtd2" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to from /dev/mtd2" sleep 2 $NandWrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz > /dev/null 2>&1 fi @@ -82,12 +83,12 @@ if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolos if [ -e /.multinfo ] ; then INFOBOOT=$( cat /.multinfo ) if [ $TARGET = $INFOBOOT ] ; then - echo "NEOBOOT is booting image " $TARGET + echo "NEOBOOT is booting image from " $TARGET else [ $PL ] && echo "Kasowanie kernel z /dev/mtd2..." || echo "Erase kernel from /dev/mtd2" sleep 2 flash_eraseall /dev/mtd2 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to /dev/mtd2" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to from /dev/mtd2" sleep 2 $NandWrite -p /dev/mtd2 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz > /dev/null 2>&1 update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -98,7 +99,7 @@ if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolos [ $PL ] && echo "Kasowanie kernel z /dev/mtd2..." || echo "Erase kernel from /dev/mtd2" sleep 2 flash_eraseall /dev/mtd2 > /dev/null 2>&1 - [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to /dev/mtd2" + [ $PL ] && echo "Wgrywanie kernel do /dev/mtd2..." || echo "Writing kernel to from /dev/mtd2" sleep 2 $NandWrite -p /dev/mtd2 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz > /dev/null 2>&1 update-alternatives --remove vmlinux vmlinux-`uname -r` || true @@ -113,7 +114,6 @@ if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolos fi else break; - fi else ln -sfn /sbin/init.sysvinit /sbin/init echo "CHIPSET: " $CHIPSET " BOXNAME: "$BOXNAME" MODEL: "$VUMODEL" " diff --git a/NeoBoot/tmpfiles/target/vu_mmcblk0p1.sh b/NeoBoot/tmpfiles/target/vu_mmcblk0p1.sh index 09075c5..d2341fc 100644 --- a/NeoBoot/tmpfiles/target/vu_mmcblk0p1.sh +++ b/NeoBoot/tmpfiles/target/vu_mmcblk0p1.sh @@ -28,9 +28,8 @@ NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location BOXNAME=$( cat /etc/hostname) UPLOAD=ImagesUpload MOUNTneoDisk=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install) -MOUNTblkid=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid) MOUNTMEDIA=$( ls /media) -DYSKMODELVENDOR=$( cat /sys/block/sda/device/model | sed "s/ *$//"; cat /sys/block/sd*/device/vendor | sed "s/ *$//" ) +DYSKMODELVENDOR=$( cat /sys/block/sd*/device/model | sed "s/ *$//"; cat /sys/block/sd*/device/vendor | sed "s/ *$//" ) if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then TARGET=`cat $NEOBOOTMOUNT$IMAGENEXTBOOT` @@ -116,9 +115,6 @@ if [ $BOXNAME = "vuultimo4k" ] || [ $BOXNAME = "vusolo4k" ] || [ $BOXNAME = "vuu echo "Neoboot location: " echo ""$MOUNTneoDisk" " sleep 1 - echo "Info media: " - echo ""$MOUNTblkid" " - sleep 1 echo "Media list: " echo ""$MOUNTMEDIA" " sleep 1