Skip to content

Commit edfa553

Browse files
author
MochiOS Team
committed
quieter boot + installer disk validation
- replace 'quiet loglevel=3' with 'loglevel=4' everywhere - TUI installer: next button disabled until disk selected - live update nav state when disk selection changes
1 parent 26b39ea commit edfa553

10 files changed

Lines changed: 32 additions & 18 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ def install_limine(target, disk, root_uuid, lfn, ch, kernels=None):
338338
config_lines.append(f":{label}")
339339
config_lines.append(" PROTOCOL=linux")
340340
config_lines.append(f" KERNEL_PATH={vmlinuz}")
341-
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw quiet loglevel=3")
341+
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw loglevel=4")
342342
config_lines.append("")
343343

344344
config = "\n".join(config_lines)

‎archiso-mochios/efiboot/loader/entries/01-archiso-linux.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ title mochios install medium (x86_64, UEFI)
22
sort-key 01
33
linux /mochi/boot/x86_64/vmlinuz-linux
44
initrd /mochi/boot/x86_64/initramfs-linux.img
5-
options archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% quiet loglevel=3 systemd.show_status=false
5+
options archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% loglevel=4 systemd.show_status=false

‎archiso-mochios/efiboot/loader/entries/02-archiso-speech-linux.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ title mochios install medium (x86_64, UEFI) with speech
22
sort-key 02
33
linux /mochi/boot/x86_64/vmlinuz-linux
44
initrd /mochi/boot/x86_64/initramfs-linux.img
5-
options archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet loglevel=3 systemd.show_status=false
5+
options archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on loglevel=4 systemd.show_status=false

‎archiso-mochios/grub/grub.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ timeout_style=menu
4646

4747
menuentry "mochios install medium (x86_64, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
4848
set gfxpayload=keep
49-
linux /mochi/boot/x86_64/vmlinuz-linux archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% quiet loglevel=3 systemd.show_status=false
49+
linux /mochi/boot/x86_64/vmlinuz-linux archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% loglevel=4 systemd.show_status=false
5050
initrd /mochi/boot/x86_64/initramfs-linux.img
5151
}
5252

5353
menuentry "mochios install medium with speakup screen reader (x86_64, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
5454
set gfxpayload=keep
55-
linux /mochi/boot/x86_64/vmlinuz-linux archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet loglevel=3 systemd.show_status=false
55+
linux /mochi/boot/x86_64/vmlinuz-linux archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on loglevel=4 systemd.show_status=false
5656
initrd /mochi/boot/x86_64/initramfs-linux.img
5757
}
5858

‎archiso-mochios/syslinux/archiso_pxe-linux.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDTEXT
66
MENU LABEL mochios install medium (x86_64, BIOS) over PXE
77
LINUX /mochi/boot/x86_64/vmlinuz-linux
88
INITRD /mochi/boot/x86_64/initramfs-linux.img
9-
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% quiet loglevel=3 systemd.show_status=false
9+
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% loglevel=4 systemd.show_status=false
1010

1111
# Accessibility boot option
1212
LABEL archspeech
@@ -17,4 +17,4 @@ ENDTEXT
1717
MENU LABEL mochios install medium (x86_64, BIOS) over PXE with ^speech
1818
LINUX /mochi/boot/x86_64/vmlinuz-linux
1919
INITRD /mochi/boot/x86_64/initramfs-linux.img
20-
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet loglevel=3 systemd.show_status=false
20+
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on loglevel=4 systemd.show_status=false

‎archiso-mochios/syslinux/archiso_sys-linux.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENDTEXT
66
MENU LABEL mochios install medium (x86_64, BIOS)
77
LINUX /mochi/boot/x86_64/vmlinuz-linux
88
INITRD /mochi/boot/x86_64/initramfs-linux.img
9-
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% quiet loglevel=3 systemd.show_status=false
9+
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% loglevel=4 systemd.show_status=false
1010

1111
# Accessibility boot option
1212
LABEL archspeech
@@ -17,4 +17,4 @@ ENDTEXT
1717
MENU LABEL mochios install medium (x86_64, BIOS) with ^speech
1818
LINUX /mochi/boot/x86_64/vmlinuz-linux
1919
INITRD /mochi/boot/x86_64/initramfs-linux.img
20-
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet loglevel=3 systemd.show_status=false
20+
APPEND archisobasedir=mochi archisosearchuuid=%ARCHISO_UUID% accessibility=on loglevel=4 systemd.show_status=false

‎installer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def install_limine(target, disk, root_uuid, lfn, ch, kernels=None):
343343
config_lines.append(f":{label}")
344344
config_lines.append(" PROTOCOL=linux")
345345
config_lines.append(f" KERNEL_PATH={vmlinuz}")
346-
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw quiet loglevel=3")
346+
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw loglevel=4")
347347
config_lines.append("")
348348

349349
config = "\n".join(config_lines)
@@ -418,12 +418,12 @@ def install_mochiboot(target, disk, root_uuid, lfn, ch, kernels=None):
418418
config_lines.append(f":{label}")
419419
config_lines.append(" PROTOCOL=linux")
420420
config_lines.append(f" KERNEL_PATH={vmlinuz}")
421-
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw quiet loglevel=3")
421+
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw loglevel=4")
422422
config_lines.append("")
423423
config_lines.append(":MOCHIOS (recovery mode)")
424424
config_lines.append(" PROTOCOL=linux")
425425
config_lines.append(f" KERNEL_PATH=/boot/vmlinuz-{kernels[0]}")
426-
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw quiet loglevel=3 mochi.recovery")
426+
config_lines.append(f" CMDLINE=root=UUID={root_uuid} rootflags=subvol=root_a rw loglevel=4 mochi.recovery")
427427
config_lines.append("")
428428

429429
config = "\n".join(config_lines)

‎mochiinstall_app.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ def _try_focus_sel(self, selector):
155155
pass
156156

157157
def _push_next(self) -> bool:
158+
if self.step == 1 and not self.config.get("disk"):
159+
hint = self.query_one("#disk_hint", Label) if self.body.query("#disk_hint") else None
160+
if hint: hint.update("[red]select a disk first![/]")
161+
return False
158162
if self.step == 6:
159163
pw = self.config.get("password", "")
160164
pw_c = self.config.get("password_confirm", "")
@@ -195,6 +199,14 @@ def action_refresh_disks(self) -> None:
195199
if self.step == 1:
196200
self.render_step()
197201

202+
def on_selection_list_selection_toggled(self, event: SelectionList.SelectionToggled) -> None:
203+
if self.step == 1:
204+
sel = self.query_one("#disk_list", SelectionList)
205+
has_disk = bool(sel.selected)
206+
hint = self.query_one("#disk_hint", Label)
207+
hint.update("")
208+
self._nav(can_next=has_disk, next_label="next")
209+
198210
def on_input_submitted(self, event: Input.Submitted) -> None:
199211
if self.step == 0:
200212
self._push_next()
@@ -273,10 +285,12 @@ def step_disk(self) -> None:
273285
self._nav(can_next=False, next_label="retry [r]")
274286
else:
275287
preselected = self.config.get("disk", "")
288+
has_disk = bool(preselected)
276289
kids += [
290+
Label("", id="disk_hint"),
277291
SelectionList(*[(d, v, v == preselected) for d, v in disks], id="disk_list"),
278292
]
279-
self._nav(next_label="next")
293+
self._nav(can_next=has_disk, next_label="next")
280294
self.body.mount(self._wrap(*kids))
281295

282296
def step_fs(self) -> None:

‎pkgbuilds/mochiboot/mochiboot.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ MOCHIBOOT_RECOVERY_ENTRY=MOCHIOS (recovery mode)
3131
:DEFAULT
3232
PROTOCOL=linux
3333
KERNEL_PATH=boot:///vmlinuz-linux
34-
CMDLINE=root=UUID=%ROOT_UUID% rw quiet loglevel=3
34+
CMDLINE=root=UUID=%ROOT_UUID% rw loglevel=4
3535

3636
:MOCHIOS (recovery mode)
3737
PROTOCOL=linux
3838
KERNEL_PATH=boot:///vmlinuz-linux
39-
CMDLINE=root=UUID=%ROOT_UUID% rw quiet loglevel=3 mochi.recovery
39+
CMDLINE=root=UUID=%ROOT_UUID% rw loglevel=4 mochi.recovery
4040

4141
:FALLBACK
4242
PROTOCOL=linux
4343
KERNEL_PATH=boot:///vmlinuz-linux
44-
CMDLINE=root=UUID=%ROOT_UUID% rw quiet loglevel=3
44+
CMDLINE=root=UUID=%ROOT_UUID% rw loglevel=4

‎pkgbuilds/mochios-branding-nightly/etc/mochiboot.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ BRANDING=MochiBoot Nightly
1212
:DEFAULT
1313
PROTOCOL=linux
1414
KERNEL_PATH=boot:///vmlinuz-linux
15-
CMDLINE=root=UUID=%ROOT_UUID% rw quiet loglevel=3
15+
CMDLINE=root=UUID=%ROOT_UUID% rw loglevel=4
1616

1717
:FALLBACK
1818
PROTOCOL=linux
1919
KERNEL_PATH=boot:///vmlinuz-linux
20-
CMDLINE=root=UUID=%ROOT_UUID% rw quiet loglevel=3
20+
CMDLINE=root=UUID=%ROOT_UUID% rw loglevel=4

0 commit comments

Comments
 (0)