NeoBoot/NeoBoot-9-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

8.10

Browse Source
This commit is contained in:
gutosie
2020-01-12 23:22:24 +02:00
committed by GitHub
parent 3ec4f25bda
commit dae2119204
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NeoBoot/files/devices.py
View File

@@ -459,11 +459,9 @@ class DevicesConf(Screen, ConfigListScreen):
f.close() f.close()
out.close() out.close()
os.rename(filename2, filename) os.rename(filename2, filename)
os.system('echo "mount -a" >> /etc/init.d/udev') os.system('echo "mount -a" >> /etc/init.d/udev')
# os.system('mount -a; echo "mount -a" >> /etc/init.d/udev; echo "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh" >> /etc/init.d/udev; echo "exit 0" >> /etc/init.d/udev')
if fileExists('/etc/init.d/mdev'): if fileExists('/etc/init.d/mdev'):
filename = '/etc/init.d/mdev' filename = '/etc/init.d/mdev'
if os.path.exists(filename): if os.path.exists(filename):
@@ -480,8 +478,6 @@ class DevicesConf(Screen, ConfigListScreen):
os.rename(filename2, filename) os.rename(filename2, filename)
system('echo "" >> /etc/init.d/mdev; echo "mount -a" >> /etc/init.d/mdev') system('echo "" >> /etc/init.d/mdev; echo "mount -a" >> /etc/init.d/mdev')
# system('mount -a; echo "" >> /etc/init.d/mdev; echo "mount -a" >> /etc/init.d/mdev; echo "/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/files/mountpoint.sh" >> /etc/init.d/mdev')
class DeviceManagerSummary(Screen): class DeviceManagerSummary(Screen):
def __init__(self, session, parent): def __init__(self, session, parent):

40
NeoBoot/files/stbbranding.py
View File

@@ -68,8 +68,8 @@ def getCPUtype():
#check install #check install
def getFSTAB(): def getFSTAB():
install='UNKNOWN' install='UNKNOWN'
if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install'): if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo'):
with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install', 'r') as f: with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo', 'r') as f:
lines = f.read() lines = f.read()
f.close() f.close()
if lines.find('UUID') != -1: if lines.find('UUID') != -1:
@@ -92,8 +92,8 @@ def getFSTAB2():
def getINSTALLNeo(): def getINSTALLNeo():
neoinstall='UNKNOWN' neoinstall='UNKNOWN'
if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install'): if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo'):
with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/install', 'r') as f: with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installNeo', 'r') as f:
lines = f.read() lines = f.read()
f.close() f.close()
if lines.find('/dev/sda1') != -1: if lines.find('/dev/sda1') != -1:
@@ -137,12 +137,10 @@ def getLocationMultiboot():
return LocationMultiboot return LocationMultiboot
def getLabelDisck(): def getLabelDisck():
label='UNKNOWN' label='UNKNOWN'
if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installblkid'): if os.path.exists('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid'):
with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/installblkid', 'r') as f: with open('/usr/lib/enigma2/python/Plugins/Extensions/NeoBoot/bin/reading_blkid', 'r') as f:
lines = f.read() lines = f.read()
f.close() f.close()
if lines.find('LABEL=') != -1: if lines.find('LABEL=') != -1:
@@ -165,6 +163,15 @@ def getNeoMount():
neo='hdd_install_/dev/sda2' neo='hdd_install_/dev/sda2'
elif lines.find('/dev/sdb2 /media/hdd') != -1: elif lines.find('/dev/sdb2 /media/hdd') != -1:
neo='hdd_install_/dev/sdb2' neo='hdd_install_/dev/sdb2'
elif lines.find('/dev/sdc1 /media/hdd') != -1:
neo='hdd_install_/dev/sdc1'
elif lines.find('/dev/sdd1 /media/hdd') != -1:
neo='hdd_install_/dev/sdd1'
elif lines.find('/dev/sde1 /media/hdd') != -1:
neo='hdd_install_/dev/sde1'
elif lines.find('/dev/sdf1 /media/hdd') != -1:
neo='hdd_install_/dev/sdf1'
return neo return neo
def getNeoMount2(): def getNeoMount2():
@@ -186,8 +193,23 @@ def getNeoMount2():
elif lines.find('/dev/sde1 /media/usb') != -1: elif lines.find('/dev/sde1 /media/usb') != -1:
neo='usb_install_/dev/sde1' neo='usb_install_/dev/sde1'
elif lines.find('/dev/sdf1 /media/usb') != -1: elif lines.find('/dev/sdf1 /media/usb') != -1:
neo='usb_install_/dev/sdf1'
elif lines.find('/dev/sda1 /media/usb2') != -1:
neo='usb_install_/dev/sda1'
elif lines.find('/dev/sdb1 /media/usb2') != -1:
neo='usb_install_/dev/sdb1'
elif lines.find('/dev/sdb2 /media/usb2') != -1:
neo='usb_install_/dev/sdb2'
elif lines.find('/dev/sdc1 /media/usb2') != -1:
neo='usb_install_/dev/sdc1'
elif lines.find('/dev/sdd1 /media/usb2') != -1:
neo='usb_install_/dev/sdd1'
elif lines.find('/dev/sde1 /media/usb2') != -1:
neo='usb_install_/dev/sde1'
elif lines.find('/dev/sdf1 /media/usb2') != -1:
neo='usb_install_/dev/sdf1' neo='usb_install_/dev/sdf1'
return neo return neo
#zwraca typ chipa prcesora #zwraca typ chipa prcesora