[multiboot] small fix for chkroot UBIMB

Author: atvcaptain

lib/python/Components/SystemInfo.py

@@ -377,7 +377,7 @@ def getWakeOnLANType(fileName):
 BoxInfo.setItem("HasKexecMultiboot", fileHas("/proc/cmdline", "kexec=1"))
 BoxInfo.setItem("cankexec", BoxInfo.getItem("kexecmb") and fileExists("/usr/bin/kernel_auto.bin") and fileExists("/usr/bin/STARTUP.cpio.gz") and not BoxInfo.getItem("HasKexecMultiboot"))
 BoxInfo.setItem("HasChkrootMultiboot", MultiBoot.isFat32("/dev/block/by-name/others") or fileExists("/dev/block/by-name/startup"))
-BoxInfo.setItem("canchkroot", fileExists("/dev/block/by-name/others") and not BoxInfo.getItem("HasChkrootMultiboot") and not fileExists("/etc/.disableChkroot"))
+BoxInfo.setItem("canchkroot", (BoxInfo.getItem("hasUBIMB") or fileExists("/dev/block/by-name/others")) and not BoxInfo.getItem("HasChkrootMultiboot") and not fileExists("/etc/.disableChkroot"))
 BoxInfo.setItem("CanNotDoSimultaneousTranscodeAndPIP", MODEL in ("vusolo4k", "gbquad4k", "gbquad4kpro", "gbue4k"))
 BoxInfo.setItem("canRecovery", MODEL in ("hd51", "vs1500", "h7", "h17", "8100s") and ("disk.img", "mmcblk0p1") or MODEL in ("xc7439", "osmio4k", "osmio4kplus", "osmini4k") and ("emmc.img", "mmcblk1p1") or MODEL in ("gbmv200", "sf8008", "sf8008m", "sx988", "ip8", "ustym4kpro", "ustym4kottpremium", "ustym4ks2ottx", "beyonwizv2", "viper4k", "og2ott4k", "og2s4k", "sx88v2", "sx888") and ("usb_update.bin", "none"))
 BoxInfo.setItem("CanUse3DModeChoices", fileExists("/proc/stb/fb/3dmode_choices") and True or False)

lib/python/Screens/Information.py

@@ -859,6 +859,20 @@ 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
 		info.append("")
 		info.append(formatLine("S", _("RAM (Details)")))
 		if self.extraSpacing:

lib/python/Screens/MultiBootManager.py

@@ -91,7 +91,7 @@ def __init__(self, session, *args):
 			"blue": (self.restoreImage, _("Restore the highlighted slot"))
 		}, prio=0, description=_("MultiBoot Manager Actions"))
 		self["restoreActions"].setEnabled(False)
-		if BoxInfo.getItem("HasKexecMultiboot") or BoxInfo.getItem("HasGPT") or BoxInfo.getItem("hasUBIMB"):
+		if BoxInfo.getItem("HasKexecMultiboot") or BoxInfo.getItem("HasGPT"):
 			self["moreSlotActions"] = HelpableActionMap(self, ["ColorActions"], {
 				"blue": (self.moreSlots, _("Add more slots"))
 			}, prio=0, description=_("MultiBoot Manager Actions"))
@@ -168,8 +168,6 @@ def deleteImageCallback(self, result):
 	def moreSlots(self):
 		if BoxInfo.getItem("HasGPT"):
 			self.session.open(GPTSlotManager)
-		elif BoxInfo.getItem("hasUBIMB"):
-			self.session.open(UBISlotManager)
 		else:
 			self.session.open(KexecSlotManager)
 
@@ -239,7 +237,7 @@ def selectionChanged(self):
 			self["restartActions"].setEnabled(True)
 			self["deleteActions"].setEnabled(True)
 			self["restoreActions"].setEnabled(False)
-		if (BoxInfo.getItem("HasKexecMultiboot") and slotCode == "R") or BoxInfo.getItem("HasGPT") or BoxInfo.getItem("hasUBIMB"):
+		if (BoxInfo.getItem("HasKexecMultiboot") and slotCode == "R") or BoxInfo.getItem("HasGPT"):
 			self["restoreActions"].setEnabled(False)
 			self["moreSlotActions"].setEnabled(True)
 			self["key_blue"].setText(_("Add more slots"))
@@ -713,17 +711,23 @@ 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": (self.rootInit, _("Start the Chkroot initialization"))
+			"green": greenAction
 		}, 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):
+		self.session.open(UBISlotManager)
+
 	def rootInit(self):
 		def rootInitCallback(*args, **kwargs):
 			self.session.open(TryQuitMainloop, QUIT_REBOOT)
@@ -866,15 +870,15 @@ def createSlots(self):
 	def formatDeviceCallback(self):
 		def closeStartUpCallback(answer):
 			if answer:
-				self.close()
+				self.session.open(TryQuitMainloop, QUIT_REBOOT)
 		MOUNTPOINT = "/tmp/boot"
 		mtdRootFs = BoxInfo.getItem("mtdrootfs")
 		mtdKernel = BoxInfo.getItem("mtdkernel")
 		device = self.UBISlotManagerDevice
 		uuidRootFS = fileReadLine(f"/dev/uuid/{device}2", default=None, source=MODULE_NAME)
 		diskSize = self.partitionSizeGB(f"/dev/{device}")
 
-		startupContent = f"kernel=/dev/{mtdKernel} root=/dev/{mtdRootFs} flash=1 rootfstype=ubifs\n"
+		startupContent = f"kernel=/dev/{mtdKernel} ubi.mtd=rootfs root=ubi0:rootfs flash=1 rootfstype=ubifs\n"
 		with open(f"{MOUNTPOINT}/STARTUP", "w") as fd:
 			fd.write(startupContent)
 		with open(f"{MOUNTPOINT}/STARTUP_FLASH", "w") as fd:
@@ -913,7 +917,9 @@ def deviceSelectionCallback(self, selection):
 	def partitionSizeGB(self, dev):
 		try:
 			base = dev.replace("/dev/", "")
-			path = f"/sys/class/block/{base}/size"
+			pathClass = f"/sys/class/block/{base}/size"
+			pathBlock = f"/sys/block/{base}/size"
+			path = pathClass if exists(pathClass) else pathBlock
 			with open(path) as fd:
 				blocks = int(fd.read().strip())
 				return (blocks * 512) // (1024 * 1024 * 1024)