diff --git a/NeoBoot/files/S50fat.sh b/NeoBoot/files/S50fat.sh index 742b424..af8fc81 100644 --- a/NeoBoot/files/S50fat.sh +++ b/NeoBoot/files/S50fat.sh @@ -46,5 +46,4 @@ if [ -f /etc/rcS.d/S50fat.sh ] ; then rm -f /etc/rcS.d/S50fat.sh echo "file S50fat.sh delete" fi -wget -O /dev/null -q "http://localhost/web/message?text=UWAGA!!!...+Uruchom+NeoBoot+by+potwierdzic+start+image...%0AOperacja+w+toku...&type=2&timeout=08" echo ok diff --git a/NeoBoot/files/stbbranding.py b/NeoBoot/files/stbbranding.py index 7b8e25f..9bb9f17 100644 --- a/NeoBoot/files/stbbranding.py +++ b/NeoBoot/files/stbbranding.py @@ -55,7 +55,7 @@ def getCPUtype(): #check install def getFSTAB(): - cpu='UNKNOWN' + install='UNKNOWN' if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install'): with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install', 'r') as f: lines = f.read() @@ -66,6 +66,19 @@ def getFSTAB(): install='NOinstall' return install +#check noe +def getNeoMount(): + neo='UNKNOWN' + if os.path.exists('/proc/mounts'): + with open('/proc/mounts', 'r') as f: + lines = f.read() + f.close() + if lines.find('/dev/sda1 /media/neoboot') != -1: + neo='neo_install_/dev/sda1' + elif lines.find('/dev/sdb1 /media/neoboot') != -1: + neo='neo_install_/dev/sdb1' + return neo + #zwraca typ chipa prcesora def getCPUSoC(): chipset='UNKNOWN' diff --git a/NeoBoot/files/tools.py b/NeoBoot/files/tools.py index cad3f12..154146e 100644 --- a/NeoBoot/files/tools.py +++ b/NeoBoot/files/tools.py @@ -678,16 +678,7 @@ class ReinstallKernel(Screen): def kernel_image(self): if fileExists('/.multinfo'): - if myboxname == 'vuduo4k' or myboxname == 'vuuno4k' or myboxname == 'vuultimo4k' or myboxname == 'vusolo4k' or myboxname == 'vuzero4k' or myboxname == 'vuuno4kse' or myboxname == 'vuunose4k' or myboxname == 'bm750' or myboxname == 'vuduo' or myboxname == 'vuuno' or myboxname == 'vuultimo' or myboxname == 'vusolo' or myboxname == 'vusolo2' or myboxname == 'vusolose' or myboxname == 'vuduo2' or myboxname == 'vuzero' or myboxname == 'vuduo': - cmd1 = 'opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; opkg configure update-modules' % (vumodel, vumodel) - self.session.open(Console, _('NeoBoot....'), [cmd1]) - elif myboxname == 'sf4008' or myboxname == 'h7' or myboxname == 'mbultra' : - cmd1 = 'opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk; opkg configure update-modules' % (myboxname, myboxname) - self.session.open(Console, _('NeoBoot....'), [cmd1]) - else: - self.messagebox = self.session.open(MessageBox, _('Canceled ... NeoBoot will not work properly !!! NeoBoot works only on VuPlus box !!!'), MessageBox.TYPE_INFO, 20) - - self.messagebox = self.session.open(MessageBox, _('NeoBoot installd kernel-image...'), MessageBox.TYPE_INFO, 4) + self.messagebox = self.session.open(MessageBox, _('NeoBoot installd kernel-image... only from flash.'), MessageBox.TYPE_INFO, 4) self.close() else: if myboxname == 'vuduo4k' or myboxname == 'vuuno4k' or myboxname == 'vuultimo4k' or myboxname == 'vusolo4k' or myboxname == 'bm750' or myboxname == 'vuduo' or myboxname == 'vuuno' or myboxname == 'vuultimo' or myboxname == 'vusolo' or myboxname == 'vusolo2' or myboxname == 'vusolose' or myboxname == 'vuduo2' or myboxname == 'vuzero' or myboxname == 'vuduo':