Merge pull request #3600 from openatv/Multiboot

[Multiboot]

Author: jbleyel

lib/python/Screens/FlashManager.py

@@ -667,7 +667,7 @@ def findImageFiles(path):
 				cmdArgs = ["-r%s" % mtdRootFS, "-a"]
 			elif BoxInfo.getItem("model") in ("dm820", "dm7080"):  # Temp solution ofgwrite auto detection not ready.
 				cmdArgs = ["-rmmcblk0p1"] if rootSubDir is None else ["-r%s" % mtdRootFS, "-c%s" % currentSlot, "-m%s" % self.slotCode]
-			elif MultiBoot.canMultiBoot() and not (self.slotCode == "R" or self.slotCode == "F"):  # Receiver with SD card MultiBoot if (rootSubDir) is None.
+			elif MultiBoot.canMultiBoot() and self.slotCode not in ("R", "F"):  # Receiver with SD card MultiBoot if (rootSubDir) is None.
 				if BoxInfo.getItem("chkrootmb"):
 					cmdArgs = ["-r%s" % mtdRootFS, "-c%s" % currentSlot, "-m%s" % self.slotCode]
 				else:

lib/python/Screens/Information.py

@@ -859,20 +859,13 @@ def formatNumber(number):
 		info.append(formatLine("P1", _("Total flash"), f"{scaleNumber(diskSize)}  ({scaleNumber(diskSize, 'Iec')})"))
 		info.append(formatLine("P1", _("Used flash"), f"{scaleNumber(diskUsed)}  ({scaleNumber(diskUsed, 'Iec')})"))
 		info.append(formatLine("P1", _("Free flash"), f"{scaleNumber(diskFree)}  ({scaleNumber(diskFree, 'Iec')})"))
-		try:
-			with open("/proc/mtd") as mtd:
-				for line in mtd:
-					if '"kernel' in line:
-						parts = line.split()
-						name = parts[3].strip('"')
-						size = int(parts[1], 16)
-						if name == "kernel":
-							label = _("Kernel partition")
-						else:
-							label = _("Kernel%s partition") % name.replace("kernel", "")
-						info.append(formatLine("P1", label, "%s (%s)" % (scaleNumber(size), scaleNumber(size, "Iec"))))
-		except:
-			pass
+		for line in fileReadLines("/proc/mtd", [], source=MODULE_NAME)
+			if "\"kernel" in line:
+				data = line.split()
+				name = data[3].strip("\"")
+				size = int(data[1], 16)
+				label = _("Kernel partition") if name == "kernel" else _("Kernel%s partition") % name.replace("kernel", "")
+				info.append(formatLine("P1", label, f"{scaleNumber(size)} ({scaleNumber(size, "Iec")})"))
 		info.append("")
 		info.append(formatLine("S", _("RAM (Details)")))
 		if self.extraSpacing:

lib/python/Screens/MultiBootManager.py

@@ -711,21 +711,18 @@ def __init__(self, session, *args):
 		self["key_red"] = StaticText()
 		self["key_green"] = StaticText()
 		self["description"] = Label()
-		greenAction = (self.rootInit, _("Start the Chkroot initialization"))
-		if BoxInfo.getItem("hasUBIMB"):
-			greenAction = (self.UBIMBInit, _("Start the Chkroot initialization"))
 		self["actions"] = HelpableActionMap(self, ["OkCancelActions", "ColorActions"], {
 			"ok": (self.close, _("Close the Chkroot MultiBoot Manager")),
 			"cancel": (self.close, _("Close the Chkroot MultiBoot Manager")),
 			"red": (self.disableChkroot, _("Disable the MultiBoot option")),
-			"green": greenAction
+			"green": (self.ubimbInit if BoxInfo.getItem("hasUBIMB") else self.rootInit, _("Start the Chkroot initialization"))
 		}, prio=-1, description=_("Chkroot Manager Actions"))
 		self["key_red"].setText(_("Disable Chkroot"))
 		self["key_green"].setText(_("Initialize"))
 		self.descriptionSuffix = _("The %s %s will reboot within 1 seconds.") % getBoxDisplayName()
 		self["description"].setText("%s\n\n%s" % (_("Press GREEN to enable MultiBoot!"), self.descriptionSuffix))
 
-	def UBIMBInit(self):
+	def ubimbInit(self):
 		self.session.open(UBISlotManager)
 
 	def rootInit(self):
@@ -917,9 +914,8 @@ def deviceSelectionCallback(self, selection):
 	def partitionSizeGB(self, dev):
 		try:
 			base = dev.replace("/dev/", "")
-			pathClass = f"/sys/class/block/{base}/size"
-			pathBlock = f"/sys/block/{base}/size"
-			path = pathClass if exists(pathClass) else pathBlock
+			path = f"/sys/class/block/{base}/size"
+			path = path if exists(path) else f"/sys/block/{base}/size"
 			with open(path) as fd:
 				blocks = int(fd.read().strip())
 				return (blocks * 512) // (1024 * 1024 * 1024)

lib/python/Tools/MultiBoot.py

@@ -176,7 +176,7 @@ def saveKernel(bootSlots, slotCode, kernel):
 							# print(f"[MultiBoot] loadBootSlots DEBUG: 'UUID=' found for device '{uuidDevice}'.")
 							if uuidDevice:
 								device = uuidDevice
-						if exists(device) or device == "ubi0:ubifs" or device == "ubi0:rootfs":
+						if exists(device) or device in ("ubi0:ubifs", "ubi0:rootfs"):
 							if slotCode not in bootSlots:
 								bootSlots[slotCode] = {}
 								# print(f"[MultiBoot] Root dictionary entry in slot '{slotCode}' created.")