diff --git a/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh b/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh index eb74ef3..29501f6 100644 --- a/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh +++ b/NeoBoot/tmpfiles/target/vu_dev_mtd1.sh @@ -36,7 +36,7 @@ else TARGET=Flash fi -if [ $VUMODEL = "bm750" ] || [ $VUMODEL = "duo" ] || [ $VUMODEL = "solo" ] || [ $VUMODEL = "uno" ] || [ $VUMODEL = "ultimo" ]; then +if [ $VUMODEL = "bm750" ] || [ $BOXNAME = "vuduo" ] || [ $BOXNAME = "vusolo" ] || [ $BOXNAME = "vuuno" ] || [ $BOXNAME = "vuultimo" ]; then if [ $TARGET = "Flash" ]; then if [ -e /.multinfo ]; then if [ -f /proc/stb/info/vumodel ] || [ ! -e /proc/stb/info/boxtype ]; then @@ -45,15 +45,13 @@ if [ $VUMODEL = "bm750" ] || [ $VUMODEL = "duo" ] || [ $VUMODEL = "solo" ] || [ sleep 2 flash_eraseall /dev/mtd1 echo "Instalacja kernel do /dev/mtd1..." - sleep 2 - nandwrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz - update-alternatives --remove vmlinux vmlinux-$KERNEL || true - fi - fi - fi - update-alternatives --remove vmlinux vmlinux-`uname -r` || true - echo "NEOBOOT is booting image from " $TARGET - echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel + sleep 2 + nandwrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz + fi + fi + update-alternatives --remove vmlinux vmlinux-`uname -r` || true + echo "NEOBOOT is booting image from " $TARGET + echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel elif [ ! -e /.multinfo ]; then if [ -f /proc/stb/info/vumodel ] || [ ! -e /proc/stb/info/boxtype ]; then @@ -63,18 +61,18 @@ if [ $VUMODEL = "bm750" ] || [ $VUMODEL = "duo" ] || [ $VUMODEL = "solo" ] || [ sleep 2 flash_eraseall /dev/mtd1 echo "Wgrywanie kernel do /dev/mtd1..." - sleep 2 - nandwrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz - update-alternatives --remove vmlinux vmlinux-$KERNEL || true - fi - fi + sleep 2 + nandwrite -p /dev/mtd1 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz + fi + fi + fi update-alternatives --remove vmlinux vmlinux-`uname -r` || true echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" fi echo "...............Shutdown Now..............." sync && echo 3 > /proc/sys/vm/drop_caches - sleep 5 + sleep 10 reboot -d -f else if [ $TARGET != "Flash" ]; then @@ -123,3 +121,4 @@ else exit 0 fi exit 0 + diff --git a/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh b/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh index f23c51d..7876a5a 100644 --- a/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh +++ b/NeoBoot/tmpfiles/target/vu_dev_mtd2.sh @@ -26,91 +26,85 @@ IMAGE=ImageBoot IMAGENEXTBOOT=/ImageBoot/.neonextboot NEOBOOTMOUNT=$( cat /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location) BOXNAME=$( cat /etc/hostname) -UPLOAD=ImagesUpload # $NEOBOOTMOUNT$IMAGE # $NEOBOOTMOUNT +UPLOAD=ImagesUpload if [ -f $NEOBOOTMOUNT$IMAGENEXTBOOT ]; then TARGET=`cat $NEOBOOTMOUNT$IMAGENEXTBOOT` else TARGET=Flash fi - -if [ $BOXNAME = "mbultra" ] || [ $CHIPSET = "bcm7424" ] || [ $VUMODEL = "solo2" ] || [ $VUMODEL = "duo2" ] || [ $VUMODEL = "solose" ] || [ $VUMODEL = "zero" ]; then + +if [ $BOXNAME = "vusolo2" ] || [ $BOXNAME = "vuduo2" ] || [ $BOXNAME = "vusolose" ] || [ $BOXNAME = "vuzero" ]; then #[ $BOXNAME = "mbultra" ] 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 - echo "Kasowanie kernel z /dev/mtd2..." - flash_eraseall /dev/mtd2 - sleep 2 - echo "Instalacja kernel do /dev/mtd2..." - nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz - update-alternatives --remove vmlinux vmlinux-$KERNEL || true - fi - update-alternatives --remove vmlinux vmlinux-`uname -r` || true - echo "NEOBOOT is booting image from " $TARGET - echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel - echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" + echo "Kasowanie kernel z /dev/mtd2..." + sleep 2 + flash_eraseall /dev/mtd2 + echo "Instalacja kernel do /dev/mtd2..." + sleep 2 + nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz + fi + fi + update-alternatives --remove vmlinux vmlinux-`uname -r` || true + echo "NEOBOOT is booting image from " $TARGET + echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel elif [ ! -e /.multinfo ]; then + if [ -f /proc/stb/info/vumodel ] || [ ! -e /proc/stb/info/boxtype ]; then if [ -e $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz ] ; then echo "Kasowanie kernel z /dev/mtd2..." - sleep 2 + sleep 2 flash_eraseall /dev/mtd2 echo "Wgrywanie kernel do /dev/mtd2..." - sleep 2 - nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz - update-alternatives --remove vmlinux vmlinux-$KERNEL || true - fi - update-alternatives --remove vmlinux vmlinux-`uname -r` || true - echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel - echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" + sleep 2 + nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$UPLOAD/.kernel/$BOXNAME.vmlinux.gz + fi + fi + update-alternatives --remove vmlinux vmlinux-`uname -r` || true + echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel + echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" fi - echo "...............Shutdown Now..............." - sync && echo 3 > /proc/sys/vm/drop_caches - sleep 5 - reboot -d -f + echo "...............Shutdown Now..............." + sync && echo 3 > /proc/sys/vm/drop_caches + sleep 10 + reboot -d -f else - if [ $TARGET != "Flash" ]; then + if [ $TARGET != "Flash" ]; then if [ -e /.multinfo ] ; then INFOBOOT=$( cat /.multinfo ) if [ $TARGET = $INFOBOOT ] ; then echo "NEOBOOT is booting image from " $TARGET - else - echo "Przenoszenie pliku kernel do /tmp" - sleep 2 - cp -f $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz /tmp/vmlinux.gz + else echo "Kasowanie kernel z /dev/mtd2" - sleep 2 + sleep 2 flash_eraseall /dev/mtd2 echo "Wgrywanie kernel do /dev/mtd2" sleep 2 - nandwrite -p /dev/mtd2 /tmp/vmlinux.gz - rm -f //tmp/vmlinux.gz + nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz update-alternatives --remove vmlinux vmlinux-`uname -r` || true echo "Kernel dla potrzeb startu systemu " $TARGET " z procesorem mips zostal zmieniony!!!" echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel - echo "Typ procesora: " $CHIPSET " STB" echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" fi else - echo "Przenoszenie pliku kernel do /tmp" - sleep 2 - cp -f $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz /tmp/vmlinux.gz echo "Kasowanie kernel z /dev/mtd2" - sleep 2 + sleep 2 flash_eraseall /dev/mtd2 - echo "Wgrywanie kernel do /dev/mtd2" - sleep 2 - nandwrite -p /dev/mtd2 /tmp/vmlinux.gz - rm -f /tmp/vmlinux.gz + echo "Wgrywanie kernel do /dev/mtd2" + sleep 2 + nandwrite -p /dev/mtd2 $NEOBOOTMOUNT$IMAGE/$TARGET/boot/$BOXNAME.vmlinux.gz update-alternatives --remove vmlinux vmlinux-`uname -r` || true echo "Kernel dla potrzeb startu systemu " $TARGET " z procesorem mips zostal zmieniony!!!" - echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel - echo "Typ procesora: " $CHIPSET " STB" - echo " NEOBOOT - zainstalowano kernel-image - " $TARGET "Za chwile nastapi restart systemu !!!" - fi - echo "...............shutdown now..............."; sleep 5; reboot -d -f -h -i + echo "Used Kernel: " $TARGET > $NEOBOOTMOUNT$UPLOAD/.kernel/used_flash_kernel + fi + echo "...............Shutdown Now..............." + sync && echo 3 > /proc/sys/vm/drop_caches + sleep 5 + reboot -d -f fi fi else