diff --git a/NeoBoot/files/devices.py b/NeoBoot/files/devices.py
index 30c5a9e..7415c21 100644
--- a/NeoBoot/files/devices.py
+++ b/NeoBoot/files/devices.py
@@ -71,7 +71,7 @@ class ManagerDevice(Screen):
self['key_red'] = Label(_('Initialize ext3'))
self['key_green'] = Label(_('SetupMounts'))
self['key_yellow'] = Label(_('Initialize ext4'))
- self['key_blue'] = Label(_('Reinstall Kernel'))
+ self['key_blue'] = Label(_('Formatting Disk'))
self['lab1'] = Label()
self.onChangedEntry = []
self.list = []
@@ -81,7 +81,7 @@ class ManagerDevice(Screen):
'red': self.Format_ext3,
'green': self.SetupMounts,
'yellow': self.Format_ext4,
- 'blue': self.Kernel_update,
+ 'blue': self.InitializationNeoB,
'back': self.close})
self.activityTimer = eTimer()
self.activityTimer.timeout.get().append(self.updateList2)
@@ -102,12 +102,12 @@ class ManagerDevice(Screen):
from Screens.HarddiskSetup import HarddiskSelection
self.session.openWithCallback(self.updateList, HarddiskSelection)
- def Kernel_update(self):
+ def InitializationNeoB(self):
if fileExists('/.multinfo'):
self.session.open(MessageBox, _("This option is available only from Flash"), MessageBox.TYPE_INFO, timeout=10)
else:
- from Plugins.Extensions.NeoBoot.files.tools import ReinstallKernel
- self.session.open(ReinstallKernel)
+ from Plugins.Extensions.NeoBoot.files.tools import InitializationFormattingDisk
+ self.session.open(InitializationFormattingDisk)
def setWindowTitle(self):
self.setTitle(_('Mount Manager'))
diff --git a/NeoBoot/files/stbbranding.py b/NeoBoot/files/stbbranding.py
index 43f8626..20efdaf 100644
--- a/NeoBoot/files/stbbranding.py
+++ b/NeoBoot/files/stbbranding.py
@@ -297,6 +297,16 @@ def getLabelDisck():
#checking device neo
+def getNeoMountDisc():
+ lines_mount = 'UNKNOWN'
+ if os.path.exists('/proc/mounts'):
+ with open('/proc/mounts', 'r') as f:
+ lines_mount = f.read()
+ f.close()
+
+ return lines_mount
+
+
def getNeoMount():
neo = 'UNKNOWN'
if os.path.exists('/proc/mounts'):
@@ -321,8 +331,8 @@ def getNeoMount():
neo = 'hdd_install_/dev/sdf1'
return neo
-
-
+
+
def getNeoMount2():
neo = 'UNKNOWN'
if os.path.exists('/proc/mounts'):
@@ -977,6 +987,47 @@ def getCheckActivateVip():
if lines.find("%s" % getBoxMacAddres()) != -1:
supportedvip = '%s' % getBoxMacAddres()
return supportedvip
+
+def getMountDiskSTB():
+ neo_disk = ' '
+ if os.path.exists('/proc/mounts'):
+ with open('/proc/mounts', 'r') as f:
+ lines = f.read()
+ f.close()
+ if lines.find('/dev/sda1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sda1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sdb1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sdb1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sda2 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sda2; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sdb2 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sdb2; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sdc1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sdc1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sdd1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sdd1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sde1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sde1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sdf1 /media/hdd') != -1:
+ os.system('touch /tmp/disk/sdf1; touch /tmp/disk/#---Select_the_disk_HDD_to_be_formatted:')
+ if lines.find('/dev/sda1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sda1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sdb1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sdb1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sda2 /media/usb') != -1:
+ os.system('touch /tmp/disk/sda2; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sdb2 /media/usb') != -1:
+ os.system('touch /tmp/disk/sdb2; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sdc1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sdc1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sdd1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sdd1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sde1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sde1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+ if lines.find('/dev/sdf1 /media/usb') != -1:
+ os.system('touch /tmp/disk/sdf1; touch /tmp/disk/#---Select_the_disk_USB_to_be_formatted:')
+
+ return neo_disk
boxbrand = sys.modules[__name__]
diff --git a/NeoBoot/files/tools.py b/NeoBoot/files/tools.py
index a5f35ed..09f70d6 100644
--- a/NeoBoot/files/tools.py
+++ b/NeoBoot/files/tools.py
@@ -33,7 +33,7 @@ from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE,
from os import system, listdir, mkdir, chdir, getcwd, rename as os_rename, remove as os_remove, popen
from os.path import dirname, isdir, isdir as os_isdir
from enigma import eTimer
-from Plugins.Extensions.NeoBoot.files.stbbranding import fileCheck, getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC, getImageATv, getBoxModelVU, getBoxMacAddres
+from Plugins.Extensions.NeoBoot.files.stbbranding import fileCheck, getNeoLocation, getImageNeoBoot, getKernelVersionString, getBoxHostName, getCPUtype, getBoxVuModel, getTunerModel, getCPUSoC, getImageATv, getBoxModelVU, getBoxMacAddres, getMountDiskSTB
import os
import time
import sys
@@ -242,11 +242,15 @@ class MBTools(Screen):
self.list.append(res)
self['list']. list = self.list
- res = (_('NeoBoot Information'), png, 23)
+ res = (_('Initialization - formatting disk for neoboot.'), png, 23)
+ self.list.append(res)
+ self['list']. list = self.list
+
+ res = (_('NeoBoot Information'), png, 24)
self.list.append(res)
self['list']. list = self.list
- res = (_('NeoBoot donate'), png, 24)
+ res = (_('NeoBoot donate'), png, 25)
self.list.append(res)
self['list']. list = self.list
@@ -301,10 +305,12 @@ class MBTools(Screen):
if self.sel == 21 and self.session.open(MultiStalker):
pass
if self.sel == 22 and self.session.open(MultibootFlashonline):
- pass
- if self.sel == 23 and self.session.open(MultiBootMyHelp):
+ pass
+ if self.sel == 23 and self.session.open(InitializationFormattingDisk):
+ pass
+ if self.sel == 24 and self.session.open(MultiBootMyHelp):
pass
- if self.sel == 24 and self.session.open(neoDONATION):
+ if self.sel == 25 and self.session.open(neoDONATION):
pass
# if self.sel == 24 and self.session.open(CheckInternet):
@@ -1866,6 +1872,65 @@ class MultibootFlashonline(Screen):
self.close()
+class InitializationFormattingDisk(Screen):
+ __module__ = __name__
+
+ skin = """
+
+
+
+
+
+
+ """
+
+ def __init__(self, session):
+ Screen.__init__(self, session)
+ self['lab1'] = Label(_('Select disk.'))
+ self['key_red'] = Label(_('Formatting'))
+ self['list'] = List([])
+ self['actions'] = ActionMap(['WizardActions', 'ColorActions'], {'back': self.close,
+ 'ok': self.deleteback,
+ 'red': self.deleteback})
+ self.backupdir = '/tmp/disk'
+ self.onShow.append(self.updateInfo)
+
+ def updateInfo(self):
+ os.system(' mkdir -p /tmp/disk ')
+ getMountDiskSTB()
+ self.backupdir = '/tmp/disk'
+ if pathExists(self.backupdir) == 0 and createDir(self.backupdir):
+ pass
+
+ imageslist = []
+ for fn in listdir(self.backupdir):
+ imageslist.append(fn)
+
+ self['list'].list = imageslist
+
+ def deleteback(self):
+ image = self['list'].getCurrent()
+ if image:
+ self.diskNeoFormatting = image.strip()
+ message = (_('Hard disk: %s Formatting ?') % image)
+ ybox = self.session.openWithCallback(self.dodeleteback, MessageBox, message, MessageBox.TYPE_YESNO)
+ ybox.setTitle(_('Format the disk ???'))
+
+ def dodeleteback(self, answer):
+ if answer is True:
+ cmd = "echo -e '\n\n%s '" % _('NeoBoot - Formatting disk .....')
+ cmd1 = "echo -e '\n\n%s '" % _('Please wait and dont disconnect the power !!! ....')
+ cmd2 = 'umount -f -l /dev/' + self.diskNeoFormatting
+ cmd3 = 'sleep 2; mkfs.ext3 -i 8400 /dev/' + self.diskNeoFormatting
+ cmd4 = 'sleep 2; tune2fs -O extents,uninit_bg,dir_index /dev/' + self.diskNeoFormatting
+ cmd5 = "echo -e '\n\n%s '" % _('Receiver reboot in 10 seconds... !!!')
+ cmd6 = 'rm -r /tmp/disk ;sleep 10; reboot -d -f'
+ self.session.open(Console, _('Disk Formatting...!'), [cmd, cmd1, cmd2, cmd3, cmd4, cmd5, cmd6])
+ self.updateInfo()
+ else:
+ self.close()
+
+
class MultiBootMyHelp(Screen):
if isFHD():
skin = """