feat: add partition detection to GUI installer + sync archiso files

Author: iluxz

archiso-mochios/airootfs/usr/lib/mochiinstall/installer.py

@@ -12,13 +12,95 @@
 
 CUSTOM_EXTRAS = {"steam"}
 
+FALLBACK_MIRRORS = [
+    "https://mirrors.kernel.org/archlinux/$repo/os/$arch",
+    "https://mirror.rackspace.com/archlinux/$repo/os/$arch",
+    "https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch",
+    "https://mirror.one.com/archlinux/$repo/os/$arch",
+    "https://archlinux.thaller.ws/archlinux/$repo/os/$arch",
+    "https://ftp.linux.org.tr/archlinux/$repo/os/$arch",
+]
+
+
+def detect_microcode():
+    try:
+        with open("/proc/cpuinfo") as f:
+            cpuinfo = f.read().lower()
+        if "authenticamd" in cpuinfo:
+            return "amd-ucode"
+        elif "genuineintel" in cpuinfo:
+            return "intel-ucode"
+    except Exception:
+        pass
+    return None
+
+
+def check_network(lfn, retries=3, delay=5):
+    import urllib.request
+    for attempt in range(retries):
+        try:
+            urllib.request.urlopen("https://archlinux.org", timeout=10)
+            lfn("network connectivity verified")
+            return True
+        except Exception:
+            if attempt < retries - 1:
+                lfn(f"[yellow]no network, retrying in {delay}s... ({attempt+1}/{retries})[/]")
+                time.sleep(delay)
+    return False
+
+
+def rank_mirrors(lfn):
+    if not shutil.which("reflector"):
+        lfn("[yellow]reflector not found, skipping mirror ranking[/]")
+        return False
+    lfn("ranking mirrors by speed...")
+    r = subprocess.run(
+        ["reflector", "--latest", "20", "--protocol", "https", "--sort", "rate",
+         "--save", "/etc/pacman.d/mirrorlist"],
+        capture_output=True, text=True, timeout=60
+    )
+    if r.returncode == 0:
+        lfn("mirrors ranked successfully")
+        return True
+    lfn(f"[yellow]reflector failed: {r.stderr.strip()[:200]}[/]")
+    return False
+
+
+def set_fallback_mirrors(lfn):
+    lfn("setting fallback mirrors...")
+    mirrorlist = "/etc/pacman.d/mirrorlist"
+    try:
+        with open(mirrorlist, "w") as f:
+            f.write("## mochios fallback mirrors\n")
+            for m in FALLBACK_MIRRORS:
+                f.write(f"Server = {m}\n")
+        lfn("fallback mirrors configured")
+    except Exception as e:
+        lfn(f"[yellow]could not write mirrorlist: {e}[/]")
+
+
+def pacstrap_with_fallback(target, pkgs, abort_flag, lfn, timeout=900):
+    try:
+        abortable_run(["pacstrap", "-K", target] + pkgs, abort_flag, timeout=timeout, log_fn=lfn)
+        return True
+    except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
+        err = str(e)[:300]
+        lfn(f"[yellow]pacstrap failed, trying fallback mirrors... ({err})[/]")
+        set_fallback_mirrors(lfn)
+        try:
+            abortable_run(["pacstrap", "-K", target] + pkgs, abort_flag, timeout=timeout, log_fn=lfn)
+            return True
+        except Exception as e2:
+            lfn(f"[red]pacstrap failed even with fallback mirrors: {e2}[/]")
+            raise
+
 _CLEANUP_TARGET = [None]
 
 def _unmount_all():
     target = _CLEANUP_TARGET[0]
     if not target or not os.path.ismount(target):
         return
-    for mp in [f"{target}/var/cache", f"{target}/var", f"{target}/home", f"{target}/boot", target]:
+    for mp in [f"{target}/boot", f"{target}/var/cache", f"{target}/var", f"{target}/home", target]:
         subprocess.run(["umount", "-l", mp], capture_output=True, check=False, timeout=10)
     subprocess.run(["umount", "-l", "/mnt/btrfs_tmp"], capture_output=True, check=False, timeout=10)
     subprocess.run(["swapoff", "-a"], capture_output=True, check=False, timeout=10)
@@ -141,6 +223,45 @@ def retry_cmd(cmd, lfn, max_retries=5, delay=2, **kwargs):
                 raise
 
 
+def detect_partitions(disk):
+    """detect existing partitions on a disk. returns list of dicts with name, size, type, mountpoint, fstype."""
+    partitions = []
+    try:
+        r = subprocess.run(
+            ["lsblk", "-Jno", "NAME,SIZE,TYPE,FSTYPE,MOUNTPOINT,LABEL", disk],
+            capture_output=True, text=True, timeout=5
+        )
+        import json
+        data = json.loads(r.stdout)
+        for dev in data.get("blockdevices", []):
+            for child in dev.get("children", []):
+                partitions.append({
+                    "name": f"/dev/{child['name']}",
+                    "size": child.get("size", "?"),
+                    "type": child.get("type", "?"),
+                    "fstype": child.get("fstype", ""),
+                    "mountpoint": child.get("mountpoint", ""),
+                    "label": child.get("label", ""),
+                })
+    except Exception:
+        pass
+    return partitions
+
+
+def detect_disk_partitions_summary(disk):
+    """return a human-readable summary of partitions on a disk."""
+    parts = detect_partitions(disk)
+    if not parts:
+        return "no partitions found (empty or unformatted disk)"
+    lines = []
+    for p in parts:
+        label = f" [{p['label']}]" if p["label"] else ""
+        mount = f" mounted at {p['mountpoint']}" if p["mountpoint"] else ""
+        fstype = f" ({p['fstype']})" if p["fstype"] else ""
+        lines.append(f"  {p['name']}  {p['size']}{fstype}{label}{mount}")
+    return "\n".join(lines)
+
+
 def select_disk(disk):
     if not disk or not disk.startswith("/dev/"):
         raise ValueError(f"invalid disk: {disk}")
@@ -194,7 +315,7 @@ def setup_btrfs(root_part, target, lfn):
     tmp = "/mnt/btrfs_tmp"
     os.makedirs(tmp, exist_ok=True)
     run(["mount", "-o", "subvol=/", root_part, tmp])
-    for sv in ["root_a", "root_b", "home", "snapshots", "var", "cache"]:
+    for sv in ["root_a", "root_b", "home", "var", "cache"]:
         run(["btrfs", "subvolume", "delete", f"{tmp}/{sv}"], check=False)
         run(["btrfs", "subvolume", "create", f"{tmp}/{sv}"])
     run(["umount", tmp])
@@ -241,13 +362,17 @@ def pacstrap_base(target, lfn, de="kde", greeter="sddm", bootloader="limine", ke
         "linux-firmware",
         "sudo", "vim", "nano",
         "gptfdisk",
-        "networkmanager", "dhcpcd", "reflector",
+        "networkmanager", "dhcpcd",
         "sbctl",
         "zsh", "git", "flatpak",
     ]
+    ucode = detect_microcode()
+    if ucode:
+        base.append(ucode)
+        lfn(f"detected CPU microcode: {ucode}")
     if filesystem == "btrfs":
         base.extend(["btrfs-progs", "snapper"])
-    abortable_run(["pacstrap", "-K", target] + base, abort_flag, timeout=900, log_fn=lfn)
+    pacstrap_with_fallback(target, base, abort_flag, lfn, timeout=900)
 
     # step 2: desktop environment
     de_pkgs = {
@@ -264,7 +389,7 @@ def pacstrap_base(target, lfn, de="kde", greeter="sddm", bootloader="limine", ke
     }
     de_choice = de_pkgs.get(de, de_pkgs["kde"])
     lfn(f"installing {de} desktop...")
-    abortable_run(["pacstrap", "-K", target] + de_choice, abort_flag, timeout=600, log_fn=lfn)
+    pacstrap_with_fallback(target, de_choice, abort_flag, lfn, timeout=600)
 
     # step 3: greeter + bootloader + extras
     greeter_pkgs = {
@@ -282,7 +407,7 @@ def pacstrap_base(target, lfn, de="kde", greeter="sddm", bootloader="limine", ke
     misc = greeter_pkgs.get(greeter, greeter_pkgs["sddm"]) + bl_pkgs.get(bootloader, []) + (extra_pkgs or [])
     if misc:
         lfn("installing greeter, bootloader, and extras...")
-        abortable_run(["pacstrap", "-K", target] + misc, abort_flag, timeout=300, log_fn=lfn)
+        pacstrap_with_fallback(target, misc, abort_flag, lfn, timeout=300)
 
 
 def configure_system(target, config, lfn, efi_uuid, swap_uuid, root_uuid):
@@ -567,7 +692,7 @@ def install_mochiboot(target, disk, root_uuid, lfn, ch, kernels=None, filesystem
 
 def cleanup_mounts(target):
     import subprocess as _sp
-    for mp in [f"{target}/var/cache", f"{target}/var", f"{target}/home", f"{target}/boot", target]:
+    for mp in [f"{target}/boot", f"{target}/var/cache", f"{target}/var", f"{target}/home", target]:
         _sp.run(["umount", "-l", mp], capture_output=True, check=False, timeout=10)
     _sp.run(["umount", "-l", "/mnt/btrfs_tmp"], capture_output=True, check=False, timeout=10)
 
@@ -652,13 +777,21 @@ def do_install(target="/mnt/mochios", config=None, log_fn=None, abort_flag=None)
         # ensure [mochi] repo is available for pacstrap
         mochi_conf = "\n[mochi]\nSigLevel = Optional TrustAll\nServer = https://github.com/iluxz/MochiOS/raw/gh-pages/os/x86_64\n"
         already_has_mochi = False
-        if os.path.exists("/etc/pacman.conf"):
-            with open("/etc/pacman.conf") as check:
+        target_pacman = f"{target}/etc/pacman.conf"
+        if os.path.exists(target_pacman):
+            with open(target_pacman) as check:
                 already_has_mochi = "[mochi]" in check.read()
         if not already_has_mochi:
-            with open("/etc/pacman.conf", "a") as f:
+            with open(target_pacman, "a") as f:
                 f.write(mochi_conf)
 
+        # rank mirrors and check network before pacstrap
+        if not check_network(log_fn):
+            log_fn("[red]no network connectivity — pacstrap will likely fail[/]")
+            log_fn("[yellow]connect to wifi or ethernet and try again[/]")
+            raise RuntimeError("no network connectivity")
+        rank_mirrors(log_fn)
+
         pacstrap_base(target, log_fn, de=config.get("de", "kde"), greeter=config.get("greeter", "sddm"), bootloader=config.get("bootloader", "limine"), kernels=config.get("kernels", ["linux"]), extra_pkgs=repo_extra, abort_flag=abort_flag, filesystem=filesystem)
 
         log_fn("relaxing SigLevel for custom packages...")

archiso-mochios/airootfs/usr/lib/mochiinstall/mochiinstall_app.py

@@ -13,10 +13,10 @@
 
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from mochi_ascii import MOCHI_ASCII
-from installer import do_install, set_progress_cb
+from installer import do_install, set_progress_cb, detect_partitions, detect_disk_partitions_summary
 
 
-STEP_NAMES = ["Hostname", "Disk", "Filesystem", "Kernel", "Extras", "Desktop & Boot", "User", "Review"]
+STEP_NAMES = ["Hostname", "Disk", "Partitions", "Filesystem", "Kernel", "Extras", "Desktop & Boot", "User", "Review"]
 
 
 class LogUpdate(Message):
@@ -111,12 +111,12 @@ def on_mount(self) -> None:
         self.render_step()
 
     def render_step(self) -> None:
-        if not (0 <= self.step < 8):
+        if not (0 <= self.step < 9):
             self.app.pop_screen()
             return
         self.step_bar.update(self.step_bar.render_step(self.step))
         self.body.remove_children()
-        step_fn = [self.step_hostname, self.step_disk, self.step_fs, self.step_kernel, self.step_extra, self.step_de_boot, self.step_user, self.step_summary][self.step]
+        step_fn = [self.step_hostname, self.step_disk, self.step_partition, self.step_fs, self.step_kernel, self.step_extra, self.step_de_boot, self.step_user, self.step_summary][self.step]
         step_fn()
         self._focus_step()
 
@@ -129,15 +129,17 @@ def _focus_step(self) -> None:
         elif self.step == 1:
             self._try_focus_sel("#disk_list")
         elif self.step == 2:
-            self._try_focus_sel("#fs")
+            self._try_focus_sel("#disk_mode")
         elif self.step == 3:
-            self._try_focus_sel("#kernel")
+            self._try_focus_sel("#fs")
         elif self.step == 4:
-            self._try_focus_sel("#extra_pkgs")
+            self._try_focus_sel("#kernel")
         elif self.step == 5:
+            self._try_focus_sel("#extra_pkgs")
+        elif self.step == 6:
             self._try_focus_sel("#de")
             self._try_focus_sel("#bootloader")
-        elif self.step == 6:
+        elif self.step == 7:
             self._try_focus("#username", Input)
 
     def _try_focus(self, selector, widget_type):
@@ -159,7 +161,7 @@ def _push_next(self) -> bool:
             hint = self.query_one("#disk_hint", Label) if self.body.query("#disk_hint") else None
             if hint: hint.update("[red]select a disk first![/]")
             return False
-        if self.step == 6:
+        if self.step == 7:
             pw = self.config.get("password", "")
             pw_c = self.config.get("password_confirm", "")
             hint = self.query_one("#pw_hint", Label) if self.body.query("#pw_hint") else None
@@ -170,7 +172,7 @@ def _push_next(self) -> bool:
                 if hint: hint.update("[red]passwords do not match[/]")
                 return False
         self.collect_current()
-        if self.step == 7:
+        if self.step == 8:
             if not self.config.get("disk"):
                 self.step = 1
                 self.render_step()
@@ -293,6 +295,19 @@ def step_disk(self) -> None:
             self._nav(can_next=has_disk, next_label="next")
         self.body.mount(self._wrap(*kids))
 
+    def step_partition(self) -> None:
+        """show partition info for selected disk."""
+        disk = self.config.get("disk", "")
+        kids = [Static(f"[bold]partitions on {disk}[/]")]
+
+        part_summary = detect_disk_partitions_summary(disk)
+        kids.append(Static(f"[dim]{part_summary}[/]"))
+        kids.append(Static(""))
+        kids.append(Static("[dim]full 'use existing partition' mode coming soon — currently wipes the whole disk[/]"))
+
+        self._nav()
+        self.body.mount(self._wrap(*kids))
+
     def step_fs(self) -> None:
         fs = self.config.get("filesystem", "btrfs")
         self.body.mount(self._wrap(
@@ -383,7 +398,8 @@ def step_summary(self) -> None:
             Static("[bold underline]review configuration[/]"),
             Static(""),
             Static(f"  hostname:    [white]{c['hostname']}[/]"),
-            Static(f"  disk:        [red]{c['disk'] or 'NOT SELECTED'}[/] {'[red bold](required!)' if not disk_set else '(will be wiped)'}"),
+            Static(f"  disk:        [red]{c['disk'] or 'NOT SELECTED'}[/] {'[red bold](required!)' if not disk_set else '[dim](will be wiped)[/]'}"),
+            Static(f"  filesystem:  [white]{c.get('filesystem', 'btrfs')}[/]"),
             Static(f"  desktop:     [white]{c['de']}[/]"),
             Static(f"  greeter:     [white]{c.get('greeter', 'sddm')}[/]"),
             Static(f"  kernels:     [white]{kernels}[/]"),
@@ -404,17 +420,17 @@ def collect_current(self) -> None:
                 sel = self.query_one("#disk_list", SelectionList)
                 if sel.selected:
                     self.config["disk"] = sel.selected[0]
-            elif self.step == 2:
+            elif self.step == 3:
                 sel = self.query_one("#fs", SelectionList)
                 if sel.selected:
                     self.config["filesystem"] = sel.selected[0]
-            elif self.step == 3:
+            elif self.step == 4:
                 sel = self.query_one("#kernel", SelectionList)
                 self.config["kernels"] = sel.selected if sel.selected else ["linux"]
-            elif self.step == 4:
+            elif self.step == 5:
                 sel = self.query_one("#extra_pkgs", SelectionList)
                 self.config["extra_pkgs"] = sel.selected if sel.selected else []
-            elif self.step == 5:
+            elif self.step == 6:
                 sel_de = self.query_one("#de", SelectionList)
                 sel_bl = self.query_one("#bootloader", SelectionList)
                 sel_gr = self.query_one("#greeter", SelectionList)
@@ -424,7 +440,7 @@ def collect_current(self) -> None:
                     self.config["bootloader"] = sel_bl.selected[0]
                 if sel_gr.selected:
                     self.config["greeter"] = sel_gr.selected[0]
-            elif self.step == 6:
+            elif self.step == 7:
                 u = self.query_one("#username", Input)
                 p = self.query_one("#password", Input)
                 pc = self.query_one("#password_confirm", Input)