From a6ae153629f8cd0408f350739a8a10357cfe0263 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 6 May 2023 22:28:32 +0200
Subject: [PATCH] new boot concept with using modules and firmware from main
 initramfs

---
 .../initcpio/install/archboot_common_modules  |  2 +-
 usr/lib/initcpio/install/archboot_init        | 14 ++++-
 usr/share/archboot/base/init                  | 61 +++++++++++--------
 3 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/usr/lib/initcpio/install/archboot_common_modules b/usr/lib/initcpio/install/archboot_common_modules
index 91800eeba..2590d4de6 100644
--- a/usr/lib/initcpio/install/archboot_common_modules
+++ b/usr/lib/initcpio/install/archboot_common_modules
@@ -26,7 +26,7 @@ build ()
 help ()
 {
 cat <<HELPEOF
-  This hook includes init, keyboard, kms and pcspkr support
+  This hook includes keyboard, kms and pcspkr support
   for an archboot image.
   DO NOT remove this one unless you know what you're doing.
 HELPEOF
diff --git a/usr/lib/initcpio/install/archboot_init b/usr/lib/initcpio/install/archboot_init
index c333ce17e..ecdce7f12 100644
--- a/usr/lib/initcpio/install/archboot_init
+++ b/usr/lib/initcpio/install/archboot_init
@@ -5,6 +5,18 @@
 build() {
     ### block and filesystem modules
     map add_module vfat? iso9660? nls_cp437? nls_ascii? cdrom?
+    ### add pcspkr
+    add_module "pcspkr"
+    ### add init modules
+    map add_module zram? btrfs? zstd? libcrc32c?
+    ### usb modules
+    add_all_modules -f '_cs|ssb-hcd' '/usb/host'
+    ### keyboard modules
+    add_all_modules '/hid/hid-(alps|apple|asus|belkin|cherry|chicony|corsair|elan|hyperv|kensignton|lenovo|logitech|magicmouse|microsoft|razer|redragon|roccat|samsung|sony|speedlink|steelseries)'
+    add_module 'usbhid'
+    add_all_modules -f 'parkbd' '/input/serio|keyboard/(applespi|atkbd)'
+    ### virtio modules
+    add_all_modules -f '9pnet|bluetooth|fs' 'virtio'
     ### sata, scsi, nvme, usb, mmc, spi (for mmc mode)
     map add_all_modules 'scsi/.*ata' \
             'ata/(ahci|pdc_adma|ata_piix|ata_generic)' '/drivers/usb/storage/'
@@ -14,7 +26,7 @@ build() {
     add_all_modules -f 'parport' 'ata/sata_'
     map add_binary bash sh blkid mount switch_root bsdcpio mkfs.btrfs setfont \
         /usr/lib/systemd/systemd-udevd udevadm systemd-tmpfiles kmod insmod modprobe \
-        gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod cut sed find
+        gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod cut sed find mkdir
     add_file "/usr/share/kbd/consolefonts/ter-v16n.psf.gz" "/consolefont-16.psf.gz"
     add_file "/usr/share/kbd/consolefonts/ter-v32n.psf.gz" "/consolefont-32.psf.gz"
     rules_d=/usr/lib/udev/rules.d
diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init
index 49d631972..cf1d0bd82 100755
--- a/usr/share/archboot/base/init
+++ b/usr/share/archboot/base/init
@@ -9,6 +9,11 @@ _emergency_shell() {
     /bin/bash
     echo b >/proc/sysrq-trigger
 }
+_udev_trigger() {
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+}
 
 # mount kernel filesystems
 mount -t proc proc /proc -o nosuid,noexec,nodev
@@ -23,11 +28,7 @@ echo archboot >/proc/sys/kernel/hostname
 kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
 systemd-tmpfiles --prefix=/dev --create --boot
 /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never &>/dev/null
-udevadm trigger --action=add --type=subsystems
-udevadm trigger --action=add --type=devices
-udevadm settle
-udevadm control --exit
-udevadm info --cleanup-db
+_udev_trigger
 # not all devices trigger autoload!
 modprobe -q cdrom
 modprobe -q usb-storage
@@ -35,22 +36,7 @@ modprobe -q zram
 modprobe -q zstd
 echo 1 > /proc/sys/kernel/sysrq
 echo -e "\e[1mInitializing\e[m \e[36mArchboot\e[m \e[1m- Arch Linux Environment:\e[m"
-# it needs one echo before, in order to reset the consolefont!
-FB_SIZE="$(cut -d 'x' -f 1 "$(find /sys -wholename '*fb0/modes')" | sed -e 's#.*:##g')"
-if [[ "${FB_SIZE}" -gt '1900' ]]; then
-    SIZE="32"
-else
-    SIZE="16"
-fi
-setfont consolefont-${SIZE}.psf.gz -C /dev/console
-echo -e "\e[1mStep 1/4:\e[m Creating /dev/zram0 with zstd compression..."
-echo "zstd" >/sys/block/zram0/comp_algorithm
-echo "4G" >/sys/block/zram0/disksize
-echo -e "\e[1mStep 2/4:\e[m Creating btrfs on /dev/zram0..."
-mkfs.btrfs /dev/zram0 &>/dev/null
-# use discard to get free RAM on delete!
-mount -o discard /dev/zram0 /sysroot &>/dev/null
-echo -e "\e[1mStep 3/4:\e[m Searching for archboot rootfs on usb/hd/cdrom device..."
+echo -e "\e[1mStep 1/5:\e[m Searching for archboot rootfs on usb/hd/cdrom device..."
 echo -e "          Trying for 10 seconds /dev/sr0 and UUID=1234-ABCD..."
 _COUNT=0
 while true; do
@@ -69,10 +55,37 @@ if ! [[ -f "/mnt/boot/initramfs-$(uname -m).img" ]] ; then
         _emergency_shell
     fi
 fi
-cd /sysroot || _emergency_shell
-echo -e "\e[1mStep 4/4:\e[m Copying archboot rootfs to /sysroot..."
+cd /
+# move in modules from main initramfs
+echo -e "\e[1mStep 2/5:\e[m Copying and loading modules from main initramfs..."
+bsdcpio -u -i "*/lib/modules/" "*/lib/firmware/" <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
+# reinitialize available modules
+udevadm control -R
+_udev_trigger
+# shutdown udevd
+udevadm control --exit
+udevadm info --cleanup-db
+# it needs one echo before, in order to reset the consolefont!
+FB_SIZE="$(cut -d 'x' -f 1 "$(find /sys -wholename '*fb0/modes')" | sed -e 's#.*:##g')"
+if [[ "${FB_SIZE}" -gt '1900' ]]; then
+    SIZE="32"
+else
+    SIZE="16"
+fi
+setfont consolefont-${SIZE}.psf.gz -C /dev/console
+echo -e "\e[1mStep 3/5:\e[m Creating /dev/zram0 with zstd compression..."
+echo "zstd" >/sys/block/zram0/comp_algorithm
+echo "4G" >/sys/block/zram0/disksize
+echo -e "\e[1mStep 4/5:\e[m Creating btrfs on /dev/zram0..."
+mkfs.btrfs /dev/zram0 &>/dev/null
+# use discard to get free RAM on delete!
+mount -o discard /dev/zram0 /sysroot &>/dev/null
+echo -e "\e[1mStep 5/5:\e[m Copying archboot rootfs files to /sysroot..."
 echo -e "          This may need some time..."
-bsdcpio -i <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
+mkdir -p /sysroot/usr/lib
+mv /lib/{modules,firmware} /sysroot/usr/lib
+cd /sysroot || _emergency_shell
+bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
 echo 0 > /proc/sys/kernel/sysrq
 # remove mkinitcpio files and directories
 rm -rf /sysroot/{hooks,install,kernel,new_root,sysroot} &>/dev/null