Skip to content

Commit 8d50dc2

Browse files
author
MochiOS Team
committed
fix: mochi repo target path, remove unsupported xfs from GUI, add filesystem to TUI summary
1 parent ced112d commit 8d50dc2

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎installer.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,11 +652,12 @@ def do_install(target="/mnt/mochios", config=None, log_fn=None, abort_flag=None)
652652
# ensure [mochi] repo is available for pacstrap
653653
mochi_conf = "\n[mochi]\nSigLevel = Optional TrustAll\nServer = https://github.com/iluxz/MochiOS/raw/gh-pages/os/x86_64\n"
654654
already_has_mochi = False
655-
if os.path.exists("/etc/pacman.conf"):
656-
with open("/etc/pacman.conf") as check:
655+
target_pacman = f"{target}/etc/pacman.conf"
656+
if os.path.exists(target_pacman):
657+
with open(target_pacman) as check:
657658
already_has_mochi = "[mochi]" in check.read()
658659
if not already_has_mochi:
659-
with open("/etc/pacman.conf", "a") as f:
660+
with open(target_pacman, "a") as f:
660661
f.write(mochi_conf)
661662

662663
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)

‎mochiinstall_app.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ def step_summary(self) -> None:
384384
Static(""),
385385
Static(f" hostname: [white]{c['hostname']}[/]"),
386386
Static(f" disk: [red]{c['disk'] or 'NOT SELECTED'}[/] {'[red bold](required!)' if not disk_set else '(will be wiped)'}"),
387+
Static(f" filesystem: [white]{c.get('filesystem', 'btrfs')}[/]"),
387388
Static(f" desktop: [white]{c['de']}[/]"),
388389
Static(f" greeter: [white]{c.get('greeter', 'sddm')}[/]"),
389390
Static(f" kernels: [white]{kernels}[/]"),

‎mochiinstall_gui.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ def __init__(self, nightly):
349349
for i, (n, d) in enumerate([
350350
("btrfs", "snapshots, compression, subvolumes"),
351351
("ext4", "simple, reliable, widely used"),
352-
("xfs", "good for large files, media workloads"),
353352
]):
354353
rb = QRadioButton(f" {n} \u2014 {d}")
355354
self._fs.addButton(rb, i)
@@ -642,7 +641,7 @@ def nextId(self):
642641
p = self.page(self.currentId())
643642

644643
if isinstance(p, FSPage):
645-
self._cfg["fs"] = ["btrfs", "ext4", "xfs"][p._fs.checkedId()]
644+
self._cfg["fs"] = ["btrfs", "ext4"][p._fs.checkedId()]
646645
self._cfg["bl"] = ["limine", "grub", "mochiboot"][p._bl.checkedId()]
647646
elif isinstance(p, KernelPage):
648647
self._cfg["kernels"] = [

0 commit comments

Comments
 (0)