diff --git a/NeoBoot/extract.py b/NeoBoot/extract.py index dd15001..b41c1e9 100644 --- a/NeoBoot/extract.py +++ b/NeoBoot/extract.py @@ -118,7 +118,12 @@ def NEOBootMainEx(source, target, CopyFiles, CopyKernel, TvList, Montowanie, Lan #arm Zgemma h7 elif getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': os.system('mv /media/neoboot/ImagesUpload/zgemma/' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) - os.system('echo "Skopiowano kernel.bin STB-ARM Zgemma h7."') + os.system('echo "Skopiowano kernel.bin STB-ARM Zgemma h7."') +#arm gbquad4k + elif getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k': + os.system('mv /media/neoboot/ImagesUpload/gigablue/quad4k' + getBoxHostName() + '/kernel.bin ' + media_target + '/boot/zImage.' + getBoxHostName() + '' + dev_null) + os.system('echo "Skopiowano kernel.bin STB-ARM gbquad4k."') + #arm vuplus elif getCPUSoC() == '7444s' or getCPUSoC() == '7278' or getCPUSoC() == '7376' or getCPUSoC() == '7252s' or getCPUSoC() == '72604': os.system('mv /media/neoboot/ImagesUpload/vuplus/' + getBoxVuModel() + '/kernel_auto.bin ' + media_target + '/boot/zImage.' + getBoxVuModel() + '' + dev_null) @@ -208,22 +213,28 @@ def NEOBootMainEx(source, target, CopyFiles, CopyKernel, TvList, Montowanie, Lan rc = os.system(cmd) if LanWlan == 'True': - os.system('echo "Skopiowano pliki sieciowe LAN-WLAN."') - if os.path.exists('/etc/wpa_supplicant.wlan0.conf'): - cmd = 'cp -Rpf /etc/wpa_supplicant.wlan0.conf %s/ImageBoot/%s/etc/wpa_supplicant.wlan0.conf > /dev/null 2>&1' % (media, target) - rc = os.system(cmd) - if os.path.exists('/etc/network/interfaces'): - cmd = 'cp -r /etc/network/interfaces %s/ImageBoot/%s/etc/network/interfaces > /dev/null 2>&1' % (media, target) - rc = os.system(cmd) - if os.path.exists('/etc/wpa_supplicant.conf'): - cmd = 'cp -Rpf /etc/wpa_supplicant.conf %s/ImageBoot/%s/etc/wpa_supplicant.conf > /dev/null 2>&1' % (media, target) - rc = os.system(cmd) - if os.path.exists('/etc/resolv.conf'): - cmd = 'cp -Rpf /etc/resolv.conf %s/ImageBoot/%s/etc/resolv.conf > /dev/null 2>&1' % (media, target) - rc = os.system(cmd) - if os.path.exists('/etc/wl.conf.wlan3'): - cmd = 'cp -r /etc/wl.conf.wlan3 %s/ImageBoot/%s/etc/wl.conf.wlan3 > /dev/null 2>&1' % (media, target) - rc = os.system(cmd) + if os.path.exists('%s/ImageBoot/%s/etc/vtiversion.info' % (media, target)): + os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') + if os.path.exists('/etc/vtiversion.info') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): + os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') + if os.path.exists('/etc/bhversion') and os.path.exists('%s/usr/lib/enigma2/python/Plugins/PLi' % (media, target)): + os.system('echo "Nie skopiowano LAN-WLAN, nie zalecane dla tego image."') + else: + if os.path.exists('/etc/wpa_supplicant.wlan0.conf'): + cmd = 'cp -Rpf /etc/wpa_supplicant.wlan0.conf %s/ImageBoot/%s/etc/wpa_supplicant.wlan0.conf > /dev/null 2>&1' % (media, target) + rc = os.system(cmd) + if os.path.exists('/etc/network/interfaces'): + cmd = 'cp -r /etc/network/interfaces %s/ImageBoot/%s/etc/network/interfaces > /dev/null 2>&1' % (media, target) + rc = os.system(cmd) + if os.path.exists('/etc/wpa_supplicant.conf'): + cmd = 'cp -Rpf /etc/wpa_supplicant.conf %s/ImageBoot/%s/etc/wpa_supplicant.conf > /dev/null 2>&1' % (media, target) + rc = os.system(cmd) + if os.path.exists('/etc/resolv.conf'): + cmd = 'cp -Rpf /etc/resolv.conf %s/ImageBoot/%s/etc/resolv.conf > /dev/null 2>&1' % (media, target) + rc = os.system(cmd) + if os.path.exists('/etc/wl.conf.wlan3'): + cmd = 'cp -r /etc/wl.conf.wlan3 %s/ImageBoot/%s/etc/wl.conf.wlan3 > /dev/null 2>&1' % (media, target) + rc = os.system(cmd) if Sterowniki == 'True': if os.path.exists('%s/ImageBoot/%s/lib/modules' % (media, target)): diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index a9e06b9..1c2ccf4 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -1,11 +1,11 @@ #!/usr/bin/python # -*- coding: utf-8 -*- - -####################### _(-_-)_ gutosie _(-_-)_ ####################### +####################### _(-_-)_ gutosie _(-_-)_ ####################### + from __init__ import _ from Plugins.Extensions.NeoBoot.files import Harddisk from Components.About import about -from Plugins.Extensions.NeoBoot.files.stbbranding import getFSTAB, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel +from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoMount, getFSTAB, getKernelVersionString, getKernelImageVersion, getCPUtype, getCPUSoC, getImageNeoBoot, getBoxVuModel, getBoxHostName, getTunerModel from enigma import getDesktop from enigma import eTimer from Screens.Screen import Screen @@ -45,8 +45,8 @@ import time # save this copyright notice. This document/program is distributed WITHOUT any # warranty, use at YOUR own risk. -PLUGINVERSION = '2.04' -UPDATEVERSION = '2.10' +PLUGINVERSION = '2.05' +UPDATEVERSION = '2.11' class MyUpgrade(Screen): screenwidth = getDesktop(0).size().width() @@ -937,14 +937,32 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" def __init__(self, session): Screen.__init__(self, session) + if not fileExists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh'): + if getNeoMount() == 'neo_install_/dev/sda1': + #os.system('mkdir -p /media/neoboot2 ; mount /dev/sda1 /media/neoboot') + os.system('touch /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh') + cel = open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh', 'w') + cel.write('#!/bin/sh\n#DESCRIPTION=This script by gutosie\n\n/bin/mount /dev/sda1 /media/neoboot \n') + cel.close() + os.system('chmod 755 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh') + elif getNeoMount() == 'neo_install_/dev/sdb1': + #os.system('mkdir -p /media/neoboot2; mount /dev/sdb1 /media/neoboot2') + os.system('touch /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh') + cel = open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh', 'w') + cel.write('#!/bin/sh\n#DESCRIPTION=This script by gutosie\n\n/bin/mount /dev/sdb1 /media/neoboot \n') + cel.close() + os.system('chmod 0755 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/neo.sh') + if fileExists('/tmp/.init_reboot'): system('rm /tmp/.init_reboot') if fileExists('/.multinfo'): - if fileExists('/.control_boot_new_image'): - os.system('rm -f /.control_boot_new_image; touch /.control_ok ') - if not fileExists('/.control_boot_new_image'): - os.system('touch /.control_ok ') + if not fileExists('/.control_ok'): + if fileExists('/.control_boot_new_image'): + os.system('rm -f /.control_boot_new_image; echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file." > /.control_ok ') + if not fileExists('/.control_boot_new_image'): + os.system('echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file." > /.control_ok') + #os.system('touch /.control_ok ') if fileExists('/.multinfo') and getCPUtype() == 'ARMv7': if os.path.exists('/proc/stb/info/boxtype'): @@ -1470,9 +1488,7 @@ valign="center" backgroundColor="black" transparent="1" foregroundColor="white" self.session.open(MessageBox, message, MessageBox.TYPE_INFO) self.close() -####################### _(-_-)_ gutosie _(-_-)_ ####################### - - + def readline(filename, iferror = ''): if iferror[:3] == 'or:': data = iferror[3:] @@ -1487,13 +1503,14 @@ def readline(filename, iferror = ''): PrintException() return data + def checkimage(): mycheck = False if fileExists('/proc/stb/info'): #vumodel'): ogranicza tylko dla vu+ mycheck = True else: mycheck = False - return mycheck + return mycheck def checkversion(session): @@ -1512,33 +1529,51 @@ def checkversion(session): else: session.open(NeoBootImageChoose) else: - session.open(MessageBox, _('Sorry: Wrong image in flash found. You have to install in flash image for you stb !!!'), MessageBox.TYPE_INFO, 10) + session.open(MessageBox, _('Sorry: Wrong image in flash found.\n You have to install in flash image for you stb !!!'), MessageBox.TYPE_INFO, 10) + + if fileExists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location'): + if fileExists('/media/neoboot/ImgeBoot/.neonextboot'): + session.open(NeoBootImageChoose) else: session.open(NeoBootInstallation) + def main(session, **kwargs): - try: - f = open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location', 'r') - mypath = f.readline().strip() - f.close() - if not os.path.exists('/media/neoboot'): - system('mkdir /media/neoboot') - cmd = 'mount ' + mypath + ' /media/neoboot' - system(cmd) - f = open('/proc/mounts', 'r') - for line in f.readlines(): - if line.find('/media/neoboot') != -1: - line = line[0:9] - break + if getNeoMount() == 'neo_install_/dev/sda1': + session.open(NeoBootImageChoose) + elif getNeoMount() == 'neo_install_/dev/sdb1': + session.open(NeoBootImageChoose) + else: + main2(session) - cmd = 'mount ' + line + ' ' + mypath - system(cmd) - cmd = 'mount ' + mypath + ' /media/neoboot' - system(cmd) - except: - pass +def main2(session, **kwargs): + if not fileExists('/media/neoboot/ImgeBoot/.neonextboot'): + try: + f = open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/.location', 'r') + mypath = f.readline().strip() + f.close() + if not fileExists('/media/neoboot'): + os.mkdir('/media/neoboot') + cmd = 'mount ' + mypath + ' /media/neoboot' + os.system(cmd) + f = open('/proc/mounts', 'r') + for line in f.readlines(): + if line.find('/media/neoboot') != -1: + line = line[0:9] + break - checkversion(session) + cmd = 'mount ' + line + ' ' + mypath + os.system(cmd) + cmd = 'mount ' + mypath + ' /media/neoboot' + os.system(cmd) + else: + pass + checkversion(session) + except: + pass + checkversion(session) + else: + checkversion(session) def menu(menuid, **kwargs): diff --git a/NeoBoot/run.py b/NeoBoot/run.py index e9676f6..916f55c 100644 --- a/NeoBoot/run.py +++ b/NeoBoot/run.py @@ -94,9 +94,10 @@ class StartImage(Screen): self.StartImageInNeoBoot() def StartImageInNeoBoot(self): - if fileExists('/media/neoboot/ImageBoot/%s/.control_ok' % ( getImageNeoBoot())): - system('touch /tmp/.control_ok ') - else: + if getImageNeoBoot() != 'Flash': + if fileExists('/media/neoboot/ImageBoot/%s/.control_ok' % ( getImageNeoBoot())): + system('touch /tmp/.control_ok ') + else: system('touch /media/neoboot/ImageBoot/%s/.control_boot_new_image ' % ( getImageNeoBoot())) system('chmod 755 /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/*') @@ -144,7 +145,7 @@ class StartImage(Screen): restartbox = self.session.openWithCallback(self.selectboot, MessageBox, _('Wybierz Tak, start image z podmiana kernel lub Nie bez wczytywania kernel.\n Zmiana kernel zalecane dla vuplus.'), MessageBox.TYPE_YESNO) restartbox.setTitle(_('Full restart GUI now ?')) - elif getCPUtype() == 'ARMv7' and getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7'or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == '7278' or getBoxHostName() == 'vuduo4k' or getCPUSoC() == '72604' or getBoxHostName() == 'vuzero4k' or getCPUSoC() == '7444s' or getBoxHostName() == 'vuultimo4k' or getCPUSoC() == '7376' or getBoxHostName() == 'vusolo4k' or getCPUSoC() == '7252s' or getBoxHostName() == 'vuuno4kse': + elif getCPUtype() == 'ARMv7' and getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7'or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == '7278' or getBoxHostName() == 'vuduo4k' or getCPUSoC() == '72604' or getBoxHostName() == 'vuzero4k' or getCPUSoC() == '7444s' or getBoxHostName() == 'vuultimo4k' or getCPUSoC() == '7376' or getBoxHostName() == 'vusolo4k' or getCPUSoC() == '7252s' or getBoxHostName() == 'vuuno4kse': restartbox = self.session.openWithCallback(self.selectboot, MessageBox, _('Wybierz:\n Tak - start image z podmiana kernel (zalecane dla VUPLUS.)\n\nWybierz:\nNie - bez wgrywania kernel( Nie zalecane).\n '), MessageBox.TYPE_YESNO) restartbox.setTitle(_('Full restart GUI now ?')) @@ -199,7 +200,7 @@ class StartImage(Screen): self.session.open(Console, _('NeoBoot ARM VU+....'), [cmd, cmd1]) self.close() - elif getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': + elif getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k' or getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' or getCPUSoC() == 'bcm7251s' or getBoxHostName() == 'h7': if getImageNeoBoot() == 'Flash': if fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -270,7 +271,7 @@ class StartImage(Screen): if getImageNeoBoot() == 'Flash': if fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'cd /media/mmc; ln -sf "init.sysvinit" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_mmcblk0p2.sh ' + cmd1 = 'cd /media/mmc; ln -sf "init.sysvinit" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_kernel.sh ' elif not fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') @@ -284,7 +285,7 @@ class StartImage(Screen): elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'ln -sfn /sbin/neoinitarm /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_mmcblk0p2.sh ' + cmd1 = 'ln -sfn /sbin/neoinitarm /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_kernel.sh ' elif fileExists('/.multinfo'): if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): @@ -293,11 +294,54 @@ class StartImage(Screen): elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') - cmd1 = 'cd /media/mmc; ln -sf "neoinitarm" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_mmcblk0p2.sh ' + cmd1 = 'cd /media/mmc; ln -sf "neoinitarm" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/h7s_kernel.sh ' self.session.open(Console, _('NeoBoot ARM....'), [cmd, cmd1]) self.close() + + def bootimageARM(self): + #gbquad4k ARM ARM gbquad4k_kernel.sh + if getCPUSoC() == 'bcm7252s' or getBoxHostName() == 'gbquad4k': + if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): + self.myclose2(_('#############>>>>>>>>>\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela zImage.%s.ipk ' % ( getBoxHostName()) )) + elif not fileExists('/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin' % ( getBoxHostName()) ): + self.myclose2(_('\n\n\nError - w lokalizacji /media/neoboot/ImagesUpload/.kernel/ \nnie odnaleziono pliku kernela flash-kernel-%s.bin ' % ( getBoxHostName()) )) + else: + if getImageNeoBoot() == 'Flash': + if fileExists('/.multinfo'): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/mmc; ln -sf "init.sysvinit" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/gbquad4k_kernel.sh ' + + elif not fileExists('/.multinfo'): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'ln -sf "init.sysvinit" "/sbin/init"; /etc/init.d/reboot' + + elif getImageNeoBoot() != 'Flash': + if not fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'ln -sfn /sbin/neoinitarm /sbin/init; /etc/init.d/reboot' + + elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'ln -sfn /sbin/neoinitarm /sbin/init; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/gbquad4k_kernel.sh ' + + elif fileExists('/.multinfo'): + if not fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'python /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/findkerneldevice.py; dd if=/media/neoboot/ImagesUpload/.kernel/flash-kernel-%s.bin of=/dev/kernel; cp -fR /media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk /tmp/zImage.ipk; opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade /tmp/zImage.ipk; cd /media/mmc;ln -sf "neoinitarm" "/media/mmc/sbin/init"; reboot -f' % getBoxHostName(), getBoxHostName() + + elif fileExists('/media/neoboot/ImageBoot/%s/boot/zImage.%s' % ( getImageNeoBoot(), getBoxHostName())): + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/mmc; ln -sf "neoinitarm" "/media/mmc/sbin/init"; /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/target/gbquad4k_kernel.sh ' + + self.session.open(Console, _('NeoBoot ARM....'), [cmd, cmd1]) + self.close() + + + + #Octagon SF4008 ARM ARM - sf4008_mmcblk0p3.sh elif getCPUSoC() == 'bcm7251' or getBoxHostName() == 'sf4008' : if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxHostName()) ): @@ -335,7 +379,7 @@ class StartImage(Screen): self.session.open(Console, _('NeoBoot ARM....'), [cmd, cmd1]) self.close() - + #VUPLUS ARM - vu_mmcblk0p1.sh elif getCPUSoC() == '7444s' or getBoxHostName() == 'vuultimo4k' or getCPUSoC() == '7376' or getBoxHostName() == 'vusolo4k' or getCPUSoC() == '7252s' or getBoxHostName() == 'vuuno4kse': if not fileExists('/media/neoboot/ImagesUpload/.kernel/zImage.%s.ipk' % ( getBoxVuModel()) ): diff --git a/NeoBoot/stbinfo b/NeoBoot/stbinfo index 8ec50ee..3e7e187 100644 --- a/NeoBoot/stbinfo +++ b/NeoBoot/stbinfo @@ -32,9 +32,10 @@ Octagon SF4008 : bcm7251 Zgemma h7S : bcm7251s Zgemma H9S : -AX HD60 4K : hi3798mv200 root@ax60:~# cat /etc/hostname : ax60 +AX HD60 4K : hi3798mv200 # cat /etc/hostname : ax60 OSmini : BCM7362 atemio6000 : bcm7362 +gbquad4k : bcm7252s # cat /proc/stb/info/model : gbquad4k # # cat /etc/hostname : gbquad4k # cat /proc/cmdline root=/dev/mmcblk0p5 rootwait rw rootflags=data=journal libata.force=1:3.0G,2:3.0G,3:3.0G coherent_poll=2M vmalloc=525m bmem=529m@491m bmem=608m@2464m diff --git a/NeoBoot/unpack.py b/NeoBoot/unpack.py index cf4f97b..71fa55f 100644 --- a/NeoBoot/unpack.py +++ b/NeoBoot/unpack.py @@ -92,7 +92,7 @@ class InstallImage(Screen, ConfigListScreen): self.CopyKernel = ConfigYesNo(default=True) self.TvList = ConfigYesNo(default=True) self.Montowanie = ConfigYesNo(default=True) - self.LanWlan = ConfigYesNo(default=True) + self.LanWlan = ConfigYesNo(default=False) self.Sterowniki = ConfigYesNo(default=False) self.InstallSettings = ConfigYesNo(default=False) self.ZipDelete = ConfigYesNo(default=False) @@ -133,7 +133,7 @@ class InstallImage(Screen, ConfigListScreen): self.list.append(getConfigListEntry(_('Source Image file'), self.source)) self.list.append(getConfigListEntry(_('Image Name'), self.target)) self.list.append(getConfigListEntry(_('Do not copy files from Flash to the installed image ?'), self.CopyFiles )) - self.list.append(getConfigListEntry(_('Copy the kernel of the installed system (recommended only for Vu+) ?'), self.CopyKernel )) + self.list.append(getConfigListEntry(_('Copy the kernel of the installed system (recommended ?'), self.CopyKernel )) self.list.append(getConfigListEntry(_('Copy the channel list ?'), self.TvList)) self.list.append(getConfigListEntry(_('Copy mounting disks ? (Recommended)'), self.Montowanie)) self.list.append(getConfigListEntry(_('Copy network settings LAN-WLAN ?'), self.LanWlan)) @@ -273,7 +273,7 @@ class HelpInstall(Screen): message += _('Do not copy files from Flash to the installed image ?') message += _(' - po zaznaczeniu tej opcji nie zostanie nic skopiowane z image flash do instalowanego image w neoboot. \n\n') - message += _('Copy the kernel of the installed system (recommended only for Vu+) ?') + message += _('Copy the kernel of the installed system (recommended ) ?') message += _(' - po zaznaczeniu tej opcji zostanie skopiowany plik jądra (kernel) instalowanego image do neoboota, zalecane tylko dla STB vuplus \n\n') message += _('Copy the channel list ?')