root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

silence systemd also on early userspace

Browse source
This commit is contained in:
Tobias Powalowski 2023-11-15 16:38:47 +01:00
parent aab57969c1
commit 2381b42cda
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/lib/archboot/cpio/init.sh
View file

@ -44,6 +44,7 @@ _progress_wait() {
} }
_task() { _task() {
if [[ "${1}" == kernel ]]; then if [[ "${1}" == kernel ]]; then
# fastest uncompression of zstd cpio format
bsdcpio -u -i "*/lib/modules/" "*/lib/firmware/" <"/mnt/efi/boot/initrd-${_ARCH}.img" &>/dev/null bsdcpio -u -i "*/lib/modules/" "*/lib/firmware/" <"/mnt/efi/boot/initrd-${_ARCH}.img" &>/dev/null
fi fi
if [[ "${1}" == cleanup ]]; then if [[ "${1}" == cleanup ]]; then
@ -65,6 +66,7 @@ ti-connectivity,tehuti,wfx,yam,yamaha}
mv /lib/modules /sysroot/usr/lib mv /lib/modules /sysroot/usr/lib
mv /lib/firmware /sysroot/usr/lib mv /lib/firmware /sysroot/usr/lib
cd /sysroot cd /sysroot
# fastest uncompression of zstd cpio format
bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i<"/mnt/efi/boot/initrd-${_ARCH}.img" &>/dev/null bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i<"/mnt/efi/boot/initrd-${_ARCH}.img" &>/dev/null
fi fi
if [[ "${1}" == unmount ]]; then if [[ "${1}" == unmount ]]; then
@ -107,10 +109,9 @@ _second_stage() {
rm /sysroot/init rm /sysroot/init
} }
# not all devices trigger autoload! # not all devices trigger autoload!
modprobe -q cdrom for i in cdrom usb-storage zram zstd; do
modprobe -q usb-storage modprobe -q "${i}"
modprobe -q zram done
modprobe -q zstd
# it needs one echo before, in order to reset the consolefont! # it needs one echo before, in order to reset the consolefont!
_msg "Initializing Console..." _msg "Initializing Console..."
_clear _clear

8
usr/share/archboot/grub/archboot-main-grub.cfg
View file

@ -54,7 +54,7 @@ if [ ${grub_platform} == "pc" ]; then
set default="Archboot - Arch Linux X86_64 - BIOS Mode" set default="Archboot - Arch Linux X86_64 - BIOS Mode"
menuentry "Archboot - Arch Linux x86_64 - BIOS Mode" { menuentry "Archboot - Arch Linux x86_64 - BIOS Mode" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=false
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img
} }
menuentry "MEMTEST86+ Memory Testing" { menuentry "MEMTEST86+ Memory Testing" {
@ -68,7 +68,7 @@ if [ ${grub_platform} == "efi" ]; then
set default="Archboot - Arch Linux x86_64" set default="Archboot - Arch Linux x86_64"
menuentry "Archboot - Arch Linux x86_64" { menuentry "Archboot - Arch Linux x86_64" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=false
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img
} }
_efi_shell _efi_shell
@ -76,14 +76,14 @@ if [ ${grub_platform} == "efi" ]; then
set default="Archboot - Arch Linux AA64" set default="Archboot - Arch Linux AA64"
menuentry "Archboot - Arch Linux AA64" { menuentry "Archboot - Arch Linux AA64" {
_menu_running _menu_running
linux /boot/Image-aarch64.gz nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0 systemd.show_status=auto linux /boot/Image-aarch64.gz nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0 systemd.show_status=false
initrd /boot/amd-ucode.img /boot/init-aarch64.img initrd /boot/amd-ucode.img /boot/init-aarch64.img
} }
elif [ ${grub_cpu} == "i386" ]; then elif [ ${grub_cpu} == "i386" ]; then
set default="Archboot - Arch Linux x86_64 - EFI MIXED MODE" set default="Archboot - Arch Linux x86_64 - EFI MIXED MODE"
menuentry "Archboot - Arch Linux x86_64 - EFI MIXED MODE" { menuentry "Archboot - Arch Linux x86_64 - EFI MIXED MODE" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 _IA32_UEFI=1 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=auto linux /boot/vmlinuz-x86_64 _IA32_UEFI=1 console=ttyS0,115200 console=tty0 audit=0 systemd.show_status=false
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img
} }
_efi_shell _efi_shell