diff --git a/lib/python/Tools/Multiboot.py b/lib/python/Tools/Multiboot.py index 8311103289e..5b0c8d53dd1 100644 --- a/lib/python/Tools/Multiboot.py +++ b/lib/python/Tools/Multiboot.py @@ -6,6 +6,7 @@ import glob import tempfile import subprocess +import re class tmp: @@ -123,7 +124,9 @@ def getCurrentImage(): def getCurrentImageMode(): - return bool(BoxInfo.getItem("canMultiBoot")) and BoxInfo.getItem("canMode12") and int(open('/sys/firmware/devicetree/base/chosen/bootargs', 'r').read().replace('\0', '').split('=')[-1]) + if BoxInfo.getItem("canMultiBoot") and BoxInfo.getItem("canMode12"): + if (results := re.search(r"\bboxmode=(\d+)\b", open("/sys/firmware/devicetree/base/chosen/bootargs", "r").read())): + return int(results.group(1)) def deleteImage(slot):