diff --git a/NeoBoot/tmpfiles/runpy/arm_run.py b/NeoBoot/tmpfiles/runpy/arm_run.py index 9dbb12f..2609d92 100644 --- a/NeoBoot/tmpfiles/runpy/arm_run.py +++ b/NeoBoot/tmpfiles/runpy/arm_run.py @@ -154,24 +154,29 @@ class StartImage(Screen): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') cmd1 = 'sleep 5; ln -sfn /sbin/init.sysvinit /sbin/init; reboot -d -f ' self.session.open(Console, _('NeoBoot-ERROR!!! ....'), [cmd, cmd1]) + elif getImageNeoBoot() != 'Flash': if fileExists('/.multinfo'): if fileExists('/media/InternalFlash/linuxrootfs1/sbin/neoinitarm'): - os.system('ln -sf "init.sysvinit" "/media/InternalFlash/linuxrootfs1/sbin/init"') - if fileExists('/media/InternalFlash/linuxrootfs2/sbin/neoinitarm'): - os.system('ln -sf "init.sysvinit" "/media/InternalFlash/linuxrootfs2/sbin/init"') - if fileExists('/media/InternalFlash/linuxrootfs3/sbin/neoinitarm'): - os.system('ln -sf "init.sysvinit" "/media/InternalFlash/linuxrootfs3/sbin/init"') - if fileExists('/media/InternalFlash/linuxrootfs4/sbin/neoinitarm'): - os.system('ln -sf "init.sysvinit" "/media/InternalFlash/linuxrootfs4/sbin/init"') - if fileExists('/media/InternalFlash'): - cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') - cmd1 ='sleep 20; reboot -d -f' - self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) - else: cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/InternalFlash/linuxrootfs1; ln -sfn /sbin/neoinitarm /media/InternalFlash/linuxrootfs1/sbin/init; sleep 5; reboot -d -f ' + self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) + elif fileExists('/media/InternalFlash/linuxrootfs2/sbin/neoinitarm'): + cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/InternalFlash/linuxrootfs2; ln -sfn /sbin/neoinitarm /media/InternalFlash/linuxrootfs2/sbin/init; sleep 5; reboot -d -f ' + self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) + elif fileExists('/media/InternalFlash/linuxrootfs3/sbin/neoinitarm'): + cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/InternalFlash/linuxrootfs3; ln -sfn /sbin/neoinitarm /media/InternalFlash/linuxrootfs3/sbin/init; sleep 5; reboot -d -f ' + self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) + elif fileExists('/media/InternalFlash/linuxrootfs4/sbin/neoinitarm'): + cmd = "echo -e '\n\n%s '" % _('...............NEOBOOT - REBOOT...............\nPlease wait, in a moment the decoder will be restarted...') + cmd1 = 'cd /media/InternalFlash/linuxrootfs4; ln -sfn /sbin/neoinitarm /media/InternalFlash/linuxrootfs4/sbin/init; sleep 5; reboot -d -f ' + self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) + else: + cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') cmd1 = 'sleep 5; reboot -d -f ' - self.session.open(Console, _('NeoBoot-Reboot ....'), [cmd, cmd1]) + self.session.open(Console, _('NeoBoot ....'), [cmd, cmd1]) elif not fileExists('/.multinfo'): cmd = "echo -e '\n\n%s '" % _('NEOBOOT - Restart image flash....\nPlease wait, in a moment the decoder will be restarted...\n') cmd1 = 'sleep 5; ln -sfn /sbin/neoinitarm /sbin/init; reboot -d -f ' @@ -189,3 +194,4 @@ class StartImage(Screen): os.system('echo "Flash " >> ' + getNeoLocation() + 'ImageBoot/.neonextboot') self.messagebox = self.session.open(MessageBox, _('It looks like it that multiboot does not support this STB.'), MessageBox.TYPE_INFO, 8) self.close() +