[pull] develop from OpenPLi:develop#40
Merged
Merged
Conversation
For more than 10 years we expect the boxmode as latest parameter in "/sys/firmware/devicetree/base/chosen/bootargs" and the STARTUP_* files but recently openATV added a parameter and add it at the end. See this commit oe-alliance/oe-alliance-core@41b655e This breaks the multiboot and leads to this crash Traceback (most recent call last): File "/usr/lib/enigma2/python/Components/ActionMap.py", line 76, in action File "/usr/lib/enigma2/python/Components/ActionMap.py", line 56, in action File "/usr/lib/enigma2/python/Screens/Menu.py", line 58, in okbuttonClick File "/usr/lib/enigma2/python/Tools/BoundFunction.py", line 10, in __call__ File "/usr/lib/enigma2/python/Screens/Menu.py", line 71, in runScreen File "/usr/lib/enigma2/python/Screens/Menu.py", line 77, in openDialog File "/usr/lib/enigma2/python/StartEnigma.py", line 296, in openWithCallback dlg = self.open(screen, *arguments, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/enigma2/python/StartEnigma.py", line 306, in open dlg = self.current_dialog = self.instantiateDialog(screen, *arguments, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/enigma2/python/StartEnigma.py", line 249, in instantiateDialog return self.doInstantiateDialog(screen, arguments, kwargs, self.desktop) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/enigma2/python/StartEnigma.py", line 266, in doInstantiateDialog dlg = screen(self, *arguments, **kwargs) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/enigma2/python/Screens/FlashImage.py", line 514, in __init__ File "/usr/lib/enigma2/python/Screens/FlashImage.py", line 530, in getImagesList File "/usr/lib/enigma2/python/Tools/Multiboot.py", line 126, in getCurrentImageMode ValueError: invalid literal for int() with base 10: '2M' This resolved this crash by explicitaly search for boxmode= and the integer value. Still for older images in the slots with these newer STARTUP_ files this might lead to crashes. We can at least try to cherry pick this to our older releases as well and/or openATV may also consider to relocate the new parameter somewhere else in that string so that boxmode is again the latest parameter.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )