NeoBoot/NeoBoot-9
1
0
Fork 0
mirror of https://mojerepo.cf/NeoBoot/NeoBoot-9.git synced 2025-10-30 15:05:48 +01:00
Code Issues Packages Projects Releases Activity

update_8.22

Browse Source
This commit is contained in:
gutosie
2020-04-13 18:06:17 +02:00
committed by GitHub
parent 1f3b918331
commit 5aea86e3ce
3 changed files with 107 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
NeoBoot/extract.py
View File

@@ -244,13 +244,13 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/udev' % (media, target) cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/udev' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
if os.path.exists('%s/ImageBoot/%s/etc/init.d/mdev'% (media, target)): # if os.path.exists('%s/ImageBoot/%s/etc/init.d/mdev'% (media, target)):
cmd = 'echo " " >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target) # cmd = 'echo " " >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
rc = os.system(cmd) # rc = os.system(cmd)
cmd = 'echo "mount -a /media/hdd; mount -a /media/usb" >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target) # cmd = 'echo "mount -a /media/hdd; mount -a /media/usb" >> %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
rc = os.system(cmd) # rc = os.system(cmd)
cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/mdev' % (media, target) # cmd = 'chmod 0755 %s/ImageBoot/%s/etc/init.d/mdev' % (media, target)
rc = os.system(cmd) # rc = os.system(cmd)
if TvList == 'True': if TvList == 'True':
if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)): if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
@@ -324,8 +324,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
if os.path.exists('/etc/tuxbox/config'): if os.path.exists('/etc/tuxbox/config'):
cmd = 'cp -r /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target) cmd = 'cp -r /etc/tuxbox/config %s/ImageBoot/%s/etc/tuxbox > /dev/null 2>&1' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
os.system('tar -czf /tmp/NeoBoot_CAM.tar.gz /usr/bin/*cam* /etc/init.d/softcam*') cmd1= 'tar -czf /tmp/filecam.tar.gz /usr/bin/*cam* /etc/init.d/softcam*; cp -af /tmp/filecam.tar.gz %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files > /dev/null 2>&1' % (media, target)
cmd1= 'cp -af /tmp/NeoBoot_CAM.tar.gz %s/ImageBoot/%s/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files > /dev/null 2>&1' % (media, target)
rc = os.system(cmd1) rc = os.system(cmd1)
os.system('echo "Copied softcam files to the installed image..."') os.system('echo "Copied softcam files to the installed image..."')
@@ -351,12 +350,15 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)): if not os.path.exists('%s/ImageBoot/%s/etc/enigma2' % (media, target)):
cmd = 'mkdir -p %s/ImageBoot/%s/etc/enigma2' % (media, target) cmd = 'mkdir -p %s/ImageBoot/%s/etc/enigma2' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
cmd = 'cp /etc/enigma2/mp_2s4p %s/ImageBoot/%s/etc/enigma2' % (media, target) if os.path.exists('/etc/enigma2/mp_2s4p'):
rc = os.system(cmd) cmd = 'cp /etc/enigma2/mp_2s4p %s/ImageBoot/%s/etc/enigma2' % (media, target)
cmd = 'cp /etc/enigma2/mp_config %s/ImageBoot/%s/etc/enigma2' % (media, target) rc = os.system(cmd)
rc = os.system(cmd) if os.path.exists('/etc/enigma2/mp_config'):
cmd = 'cp /etc/enigma2/mp_pluginliste %s/ImageBoot/%s/etc/enigma2' % (media, target) cmd = 'cp /etc/enigma2/mp_config %s/ImageBoot/%s/etc/enigma2' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
if os.path.exists('/etc/enigma2/mp_pluginliste'):
cmd = 'cp /etc/enigma2/mp_pluginliste %s/ImageBoot/%s/etc/enigma2' % (media, target)
rc = os.system(cmd)
os.system('echo "Copied MediaPortal..."') os.system('echo "Copied MediaPortal..."')
elif not os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal'): elif not os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/MediaPortal'):
os.system('echo "MediaPortal not found."') os.system('echo "MediaPortal not found."')
@@ -400,7 +402,7 @@ def NEOBootMainEx(source, target, stopenigma, CopyFiles, CopyKernel, TvList, Ste
rc = os.system(cmd) rc = os.system(cmd)
cmd = 'grep "config.timezone.val" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target) cmd = 'grep "config.timezone.val" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
cmd = 'cp -r /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/S50fat.sh %s/ImageBoot/%s/etc/rcS.d' % (media, target) cmd = 'grep "config.servicelist.startuproot" /etc/enigma2/settings >> %s/ImageBoot/%s/etc/enigma2/settings' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)
cmd = 'grep "UUID=" /etc/fstab >> %s/ImageBoot/%s/etc/fstab' % (media, target) cmd = 'grep "UUID=" /etc/fstab >> %s/ImageBoot/%s/etc/fstab' % (media, target)
rc = os.system(cmd) rc = os.system(cmd)

131
NeoBoot/plugin.py
View File

@@ -50,7 +50,7 @@ LinkNeoBoot = '/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot'
# warranty, use at YOUR own risk. # warranty, use at YOUR own risk.
PLUGINVERSION = '8.01' PLUGINVERSION = '8.01'
UPDATEVERSION = '8.21' UPDATEVERSION = '8.22'
def Freespace(dev): def Freespace(dev):
statdev = os.statvfs(dev) statdev = os.statvfs(dev)
@@ -273,7 +273,7 @@ class Opis(Screen):
cmd1 = 'rm -R ' + LinkNeoBoot + '' cmd1 = 'rm -R ' + LinkNeoBoot + ''
cmd2 = 'rm -R /sbin/neoinit*' cmd2 = 'rm -R /sbin/neoinit*'
cmd3 = 'ln -sfn /sbin/init.sysvinit /sbin/init' cmd3 = 'ln -sfn /sbin/init.sysvinit /sbin/init'
cmd4 = 'opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade volatile-media; sleep 10; reboot -f' cmd4 = 'opkg install --force-maintainer --force-reinstall --force-overwrite --force-downgrade volatile-media; sleep 10; PATH=/sbin:/bin:/usr/sbin:/usr/bin; echo -n "Rebooting... "; reboot -d -f'
self.session.open(Console, _('NeoBot was removed !!! \nThe changes will be visible only after complete restart of the receiver.'), [cmd, self.session.open(Console, _('NeoBot was removed !!! \nThe changes will be visible only after complete restart of the receiver.'), [cmd,
cmd1, cmd1,
cmd2, cmd2,
@@ -295,26 +295,26 @@ class NeoBootInstallation(Screen):
self['key_red'] = Label(_('Instruction')) self['key_red'] = Label(_('Instruction'))
self['key_green'] = Label(_('Installation')) self['key_green'] = Label(_('Installation'))
# self['key_yellow'] = Label(_('Info disc')) # self['key_yellow'] = Label(_('Info disc'))
self['key_yellow'] = Label(_('Set Disk Label')) self['key_yellow'] = Label(_('SetDiskLabel'))
self['key_blue'] = Label(_('Device Manager')) self['key_blue'] = Label(_('Device Manager'))
self['label1'] = Label(_('Welcome to NeoBoot %s Plugin installation.') % PLUGINVERSION) self['label1'] = Label(_('Welcome to NeoBoot %s Plugin installation.') % PLUGINVERSION)
self['label3'] = Label(_('WARNING !!! First, mount the device.')) self['label3'] = Label(_('WARNING !!! First, mount the device.'))
self['label2'] = Label(_('Here is the list of mounted devices in Your STB\nPlease choose a device where You would like to install NeoBoot')) self['label2'] = Label(_('Here is the list of mounted devices in Your STB\nPlease choose a device where You would like to install NeoBoot'))
self['actions'] = ActionMap(['WizardActions', 'ColorActions', 'DirectionActions'], {'red': self.Instrukcja, self['actions'] = ActionMap(['WizardActions', 'ColorActions', 'DirectionActions'], {'red': self.Instrukcja,
'green': self.install, 'green': self.checkinstall,
# 'yellow': self.datadrive, # 'yellow': self.datadrive,
'yellow': self.SetDiskLabel, 'yellow': self.SetDiskLabel,
'blue': self.devices, 'blue': self.devices,
'back': self.close}) 'back': self.close})
self.updateList() self.updateList()
def Instrukcja(self):
self.session.open(MyHelp)
def SetDiskLabel(self): def SetDiskLabel(self):
from Plugins.Extensions.NeoBoot.files.devices import SetDiskLabel from Plugins.Extensions.NeoBoot.files.devices import SetDiskLabel
self.session.open(SetDiskLabel) self.session.open(SetDiskLabel)
def Instrukcja(self):
self.session.open(MyHelp)
def datadrive(self): def datadrive(self):
try: try:
message = "echo -e '\n" message = "echo -e '\n"
@@ -417,21 +417,52 @@ class NeoBootInstallation(Screen):
else: else:
self.close() self.close()
def install(self): def checkinstall(self):
if checkInternet(): if checkInternet():
system('blkid -c /dev/null /dev/sd* > ' + LinkNeoBoot + '/bin/reading_blkid; chmod 755 ' + LinkNeoBoot + '/bin/reading_blkid ') self.check_LabelDisck()
if getFSTAB2() != 'OKinstall':
self.session.open(MessageBox, _('NeoBot - First use the Device Manager and mount the drives correctly !!!'), MessageBox.TYPE_INFO, 8)
self.close()
if getLabelDisck() != 'LABEL=':
self.session.open(MessageBox, _('NeoBot - First use yellow button and Set Disk Label !!!'), MessageBox.TYPE_INFO, 8)
self.close()
else:
self.first_installation()
else: else:
session.open(MessageBox, "Geen internet - Brak internetu", MessageBox.TYPE_INFO) session.open(MessageBox, "Geen internet - Brak internetu", MessageBox.TYPE_INFO)
def check_LabelDisck(self):
system('blkid -c /dev/null /dev/sd* > ' + LinkNeoBoot + '/bin/reading_blkid; chmod 755 ' + LinkNeoBoot + '/bin/reading_blkid ')
if getLabelDisck() != 'LABEL=':
message = _('NeoBot - First use yellow button and Set Disk Label !!!')
ybox = self.session.openWithCallback(self.goSetDiskLabel, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('Install Confirmation'))
else:
self.check_fstabUUID()
def check_fstabUUID(self):
if getFSTAB2() != 'UUID':
message = _('Disk UUID not found\n - Universally unique identifier (UUID) is not required.\nYou can proceed with further installation or give an ID to your disk.\nTo continue ?')
ybox = self.session.openWithCallback(self.SetMountPointFSTAB, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('Install Confirmation'))
else:
self.first_installation()
def goSetDiskLabel(self, yesno):
if yesno:
from Plugins.Extensions.NeoBoot.files.devices import SetDiskLabel
self.session.open(SetDiskLabel)
else:
message = _('NeoBot - choose what you want to do, install or not !!!')
ybox = self.session.openWithCallback(self.goInstall, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('Install Confirmation'))
def SetMountPointFSTAB(self, yesno):
if yesno:
message = _('Proceed with further installation without providing a unique identifier for the disks ?')
ybox = self.session.openWithCallback(self.goInstall, MessageBox, message, MessageBox.TYPE_YESNO)
ybox.setTitle(_('Install Confirmation'))
else:
self.devices()
def goInstall(self, yesno):
if yesno:
self.first_installation()
else:
self.myclose2(_('NeoBoot has not been installed ! :(' ))
def first_installation(self): def first_installation(self):
check = False check = False
if fileExists('/proc/mounts'): if fileExists('/proc/mounts'):
@@ -462,7 +493,7 @@ class NeoBootInstallation(Screen):
def first_installationNeoBoot(self): def first_installationNeoBoot(self):
self.mysel = self['config'].getCurrent() self.mysel = self['config'].getCurrent()
system('cd ' + LinkNeoBoot + '/; chmod 0755 ./bin/neoini*; chmod 0755 ./ex_init.py; chmod 0755 ./target/*.sh; chmod 0755 ./files/NeoBoot.sh; chmod 0755 ./files/S50fat.sh; cp -rf ' + LinkNeoBoot + '/bin/neoini* /sbin cd;') system('cd ' + LinkNeoBoot + '/; chmod 0755 ./bin/neoini*; chmod 0755 ./ex_init.py; chmod 0755 ./target/*.sh; chmod 0755 ./files/NeoBoot.sh; chmod 0755 ./files/userscript.sh; cp -rf ' + LinkNeoBoot + '/bin/neoini* /sbin cd;')
cmd1 = 'mkdir ' + self.mysel + 'ImageBoot;mkdir ' + self.mysel + 'ImagesUpload' cmd1 = 'mkdir ' + self.mysel + 'ImageBoot;mkdir ' + self.mysel + 'ImagesUpload'
system(cmd1) system(cmd1)
cmd2 = 'mkdir ' + self.mysel + 'ImageBoot;mkdir ' + self.mysel + 'ImagesUpload/.kernel' cmd2 = 'mkdir ' + self.mysel + 'ImageBoot;mkdir ' + self.mysel + 'ImagesUpload/.kernel'
@@ -684,43 +715,43 @@ class NeoBootImageChoose(Screen):
if not fileExists('' + LinkNeoBoot + '/files/mountpoint.sh'): if not fileExists('' + LinkNeoBoot + '/files/mountpoint.sh'):
os.system('touch ' + LinkNeoBoot + '/files/mountpoint.sh; echo "#!/bin/sh\n#DESCRIPTION=This script by gutosie\n" >> ' + LinkNeoBoot + '/files/mountpoint.sh; chmod 0755 ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('touch ' + LinkNeoBoot + '/files/mountpoint.sh; echo "#!/bin/sh\n#DESCRIPTION=This script by gutosie\n" >> ' + LinkNeoBoot + '/files/mountpoint.sh; chmod 0755 ' + LinkNeoBoot + '/files/mountpoint.sh')
if getNeoMount() == 'hdd_install_/dev/sda1': if getNeoMount() == 'hdd_install_/dev/sda1':
os.system('echo "umount /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/hdd\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/hdd\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount() == 'hdd_install_/dev/sdb1': elif getNeoMount() == 'hdd_install_/dev/sdb1':
os.system('echo "umount /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/hdd\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/hdd\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount() == 'hdd_install_/dev/sda2': elif getNeoMount() == 'hdd_install_/dev/sda2':
os.system('echo "umount /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sda2\n/bin/mount /dev/sda2 /media/hdd\n/bin/mount /dev/sda2 /media/sda2" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sda2\n/bin/mount /dev/sda2 /media/hdd\n/bin/mount /dev/sda2 /media/sda2" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount() == 'hdd_install_/dev/sdb2': elif getNeoMount() == 'hdd_install_/dev/sdb2':
os.system('echo "umount /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sdb2\n/bin/mount /dev/sdb2 /media/hdd\n/bin/mount /dev/sdb2 /media/sdb2" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/hdd\nmkdir -p /media/hdd\nmkdir -p /media/sdb2\n/bin/mount /dev/sdb2 /media/hdd\n/bin/mount /dev/sdb2 /media/sdb2" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
if getNeoMount2() == 'usb_install_/dev/sdb1': if getNeoMount2() == 'usb_install_/dev/sdb1':
os.system('echo "\numount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/usb\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "\numount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/usb\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sda1': elif getNeoMount2() == 'usb_install_/dev/sda1':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/sda1\n/bin/mount /dev/sda1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/sda1\n/bin/mount /dev/sda1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sdb2': elif getNeoMount2() == 'usb_install_/dev/sdb2':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdb2\n/bin/mount /dev/sdb2 /media/sdb2\n/bin/mount /dev/sdb2 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdb2\n/bin/mount /dev/sdb2 /media/sdb2\n/bin/mount /dev/sdb2 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sdc1': elif getNeoMount2() == 'usb_install_/dev/sdc1':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdc1\n/bin/mount /dev/sdc1 /media/sdb2\n/bin/mount /dev/sdc1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdc1\n/bin/mount /dev/sdc1 /media/sdb2\n/bin/mount /dev/sdc1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sdd1': elif getNeoMount2() == 'usb_install_/dev/sdd1':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdd1\n/bin/mount /dev/sdd1 /media/sdd1\n/bin/mount /dev/sdd1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdd1\n/bin/mount /dev/sdd1 /media/sdd1\n/bin/mount /dev/sdd1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sde1': elif getNeoMount2() == 'usb_install_/dev/sde1':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sde1\n/bin/mount /dev/sde1 /media/sde1\n/bin/mount /dev/sde1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sde1\n/bin/mount /dev/sde1 /media/sde1\n/bin/mount /dev/sde1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount2() == 'usb_install_/dev/sdf1': elif getNeoMount2() == 'usb_install_/dev/sdf1':
os.system('echo "umount /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdf1\n/bin/mount /dev/sdf1 /media/sdf1\n/bin/mount /dev/sdf1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/usb\nmkdir -p /media/usb\nmkdir -p /media/sdf1\n/bin/mount /dev/sdf1 /media/sdf1\n/bin/mount /dev/sdf1 /media/usb" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount3() == 'cf_install_/dev/sda1': elif getNeoMount3() == 'cf_install_/dev/sda1':
os.system('echo "umount /media/cf\nmkdir -p /media/cf\nmkdir -p /media/sdb1\n/bin/mount /dev/sda1 /media/cf\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/cf\nmkdir -p /media/cf\nmkdir -p /media/sdb1\n/bin/mount /dev/sda1 /media/cf\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount3() == 'cf_install_/dev/sdb1': elif getNeoMount3() == 'cf_install_/dev/sdb1':
os.system('echo "umount /media/cf\nmkdir -p /media/cf\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/cf\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/cf\nmkdir -p /media/cf\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/cf\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount4() == 'card_install_/dev/sda1': elif getNeoMount4() == 'card_install_/dev/sda1':
os.system('echo "umount /media/card\nmkdir -p /media/card\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/card\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/card\nmkdir -p /media/card\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/card\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount4() == 'card_install_/dev/sdb1': elif getNeoMount4() == 'card_install_/dev/sdb1':
os.system('echo "umount /media/card\nmkdir -p /media/card\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/card\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/card\nmkdir -p /media/card\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/card\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount5() == 'mmc_install_/dev/sda1': elif getNeoMount5() == 'mmc_install_/dev/sda1':
os.system('echo "umount /media/mmc\nmkdir -p /media/mmc\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/mmc\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/mmc\nmkdir -p /media/mmc\nmkdir -p /media/sda1\n/bin/mount /dev/sda1 /media/mmc\n/bin/mount /dev/sda1 /media/sda1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
elif getNeoMount5() == 'mmc_install_/dev/sdb1': elif getNeoMount5() == 'mmc_install_/dev/sdb1':
os.system('echo "umount /media/mmc\nmkdir -p /media/mmc\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/mmc\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh') os.system('echo "umount -l /media/mmc\nmkdir -p /media/mmc\nmkdir -p /media/sdb1\n/bin/mount /dev/sdb1 /media/mmc\n/bin/mount /dev/sdb1 /media/sdb1" >> ' + LinkNeoBoot + '/files/mountpoint.sh')
if not fileExists('' + LinkNeoBoot + '/files/neom'): if not fileExists('' + LinkNeoBoot + '/files/neom'):
@@ -767,9 +798,14 @@ class NeoBootImageChoose(Screen):
system('rm /tmp/.init_reboot') system('rm /tmp/.init_reboot')
if fileExists('/.multinfo'): if fileExists('/.multinfo'):
if checkInternet():
pass
else:
os.system('/etc/init.d/networking stop; sync; /etc/init.d/networking start;')
if not fileExists('/.control_ok'): if not fileExists('/.control_ok'):
if fileExists('/.control_boot_new_image'): 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 ') os.system('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/userscript.sh; 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'): 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('echo "Image uruchomione OK\nNie kasuj tego pliku. \n\nImage started OK\nDo not delete this file." > /.control_ok')
#os.system('touch /.control_ok ') #os.system('touch /.control_ok ')
@@ -830,6 +866,9 @@ class NeoBootImageChoose(Screen):
#if getBoxHostName == 'osmio4k': #if getBoxHostName == 'osmio4k':
#os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p5 /media/mmc') #os.system('mkdir -p /media/mmc; mount /dev/mmcblk0p5 /media/mmc')
if fileCheck('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/filecam.tar.gz'):
os.system('rm -r /tmp/*.tar.gz; mv /usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/filecam.tar.gz /tmp ; /bin/tar -xzvf /tmp/*.tar.gz -C /; rm -fr /tmp/*.tar.gz; ln -s /usr/lib/libcrypto.so.1.0.2 /usr/lib/libcrypto.so.1.0.0; opkg install install libssl1.0.0')
self.list = [] self.list = []
self.setTitle(' NeoBoot %s - Menu' % PLUGINVERSION + ' ' + 'Ver. update: %s' % UPDATEVERSION) self.setTitle(' NeoBoot %s - Menu' % PLUGINVERSION + ' ' + 'Ver. update: %s' % UPDATEVERSION)
self['device_icon'] = Pixmap() self['device_icon'] = Pixmap()
@@ -878,19 +917,19 @@ class NeoBootImageChoose(Screen):
'2': self.ReinstallNeoBoot, '2': self.ReinstallNeoBoot,
'3': self.ReinstallKernel, '3': self.ReinstallKernel,
'4': self.ReinstallKernel, '4': self.ReinstallKernel,
'5': self.boot, '5': self.boot, #hidden option
'9': self.boot, '9': self.boot, #hidden option
'0': self.Cam_Restart, '0': self.Cam_Restart, #hidden option
'back': self.close_exit}) 'back': self.close_exit})
if not fileExists('/etc/name'): if not fileExists('/etc/name'):
os.system('touch /etc/name') os.system('touch /etc/name')
self.onShow.append(self.updateList) self.onShow.append(self.updateList)
def Cam_Restart(self): def Cam_Restart(self):
if fileCheck('/etc/init.d/softcam'): if fileCheck('/etc/init.d/softcam'):
os.system('/etc/init.d/softcam stop; sleep 2; /etc/init.d/softcam start||restart') os.system('/etc/init.d/softcam stop; sleep 2; /etc/init.d/softcam start||restart')
self.session.open(MessageBox, _('SoftCam zosta\xc5\x82a zrestartowany.'), MessageBox.TYPE_INFO, 5) self.session.open(MessageBox, _('SoftCam zosta\xc5\x82a zrestartowany.'), MessageBox.TYPE_INFO, 5)
self.close() self.close()
def DownloadImageOnline(self): def DownloadImageOnline(self):
if not os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/ImageDownloader/download.py'): if not os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/ImageDownloader/download.py'):
@@ -935,7 +974,7 @@ class NeoBootImageChoose(Screen):
if answer is True: if answer is True:
try: try:
cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Please reinstall NeoBoot....\nPlease wait, done...\nrestart systemu...') cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Please reinstall NeoBoot....\nPlease wait, done...\nrestart systemu...')
cmd1 = 'cd ' + LinkNeoBoot + '/; rm ./bin/install; rm ./.location; rm ./files/mountpoint.sh; rm ./files/neom; rm ./files/neo.sh; sleep 5; killall -9 enigma2 ' cmd1 = 'cd ' + LinkNeoBoot + '/; rm ./bin/install; rm ./.location; rm ./files/mountpoint.sh; rm ./files/neom; rm ./files/neo.sh; sleep 5; PATH=/sbin:/bin:/usr/sbin:/usr/bin; echo -n "Restarting E2... "; init 4; sleep 1; init 3 '
except: except:
False False
self.session.open(Console, _('NeoBoot ARM....'), [cmd, cmd1]) self.session.open(Console, _('NeoBoot ARM....'), [cmd, cmd1])
@@ -1031,7 +1070,7 @@ class NeoBootImageChoose(Screen):
if not fileExists('/tmp/neoboot.zip'): if not fileExists('/tmp/neoboot.zip'):
self.session.open(MessageBox, _('Unfortunately, at the moment not found an update, try again later.'), MessageBox.TYPE_INFO, 8) self.session.open(MessageBox, _('Unfortunately, at the moment not found an update, try again later.'), MessageBox.TYPE_INFO, 8)
else: else:
os.system('cd /tmp/; unzip -qn ./neoboot.zip; rm -f ./neoboot.zip; cp -rf ./NeoBoot8-master/NeoBoot /usr/lib/enigma2/python/Plugins/Extensions; rm -rf /tmp/NeoBoot8-master; rm ' + LinkNeoBoot + '/ver.txt; cd ' + LinkNeoBoot + '/; chmod 0755 ./bin/neoini*; chmod 0755 ./ex_init.py; chmod 0755 ./target/*; chmod 0755 ./files/NeoBoot.sh; chmod 0755 ./files/S50fat.sh; cd') os.system('cd /tmp/; unzip -qn ./neoboot.zip; rm -f ./neoboot.zip; cp -rf ./NeoBoot8-master/NeoBoot /usr/lib/enigma2/python/Plugins/Extensions; rm -rf /tmp/NeoBoot8-master; rm ' + LinkNeoBoot + '/ver.txt; cd ' + LinkNeoBoot + '/; chmod 0755 ./bin/neoini*; chmod 0755 ./ex_init.py; chmod 0755 ./target/*; chmod 0755 ./files/NeoBoot.sh; chmod 0755 ./files/userscript.sh; cd')
if getCPUtype() == 'MIPS': if getCPUtype() == 'MIPS':
os.system('cd ' + LinkNeoBoot + '/; cp -rf ./bin/neoinitmipsvu /sbin; chmod 755 /sbin/neoinitmipsvu; cp -rf ./bin/neoinitmips /sbin; chmod 755 /sbin/neoinitmips; cd') os.system('cd ' + LinkNeoBoot + '/; cp -rf ./bin/neoinitmipsvu /sbin; chmod 755 /sbin/neoinitmipsvu; cp -rf ./bin/neoinitmips /sbin; chmod 755 /sbin/neoinitmips; cd')
#elif getCPUtype() == 'ARMv7': #elif getCPUtype() == 'ARMv7':

3
NeoBoot/unpack.py
View File

@@ -6,7 +6,8 @@ from Plugins.Extensions.NeoBoot.files.stbbranding import getNeoLocation, getKern
from enigma import getDesktop from enigma import getDesktop
from enigma import eTimer from enigma import eTimer
from Screens.Screen import Screen from Screens.Screen import Screen
from Screens.Console import Console #from Screens.Console import Console
from files.nConsole import Console
from Screens.MessageBox import MessageBox from Screens.MessageBox import MessageBox
from Screens.ChoiceBox import ChoiceBox from Screens.ChoiceBox import ChoiceBox
from Screens.VirtualKeyBoard import VirtualKeyBoard from Screens.VirtualKeyBoard import VirtualKeyBoard