From d27e1bd65dd957a201ef6efc077d414afa1e7670 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 3 Jan 2023 15:37:31 -0800 Subject: [PATCH] main/pmos-mkinitfs: run udev after mounting the initramfs-extra (MR 3777) By positioning this after extracting the initramfs-extra archive, we can allow udev to exist in the -extra archive and not have any size impact on the base initramfs archive. Any hook that needs udev in the initramfs can get that support, provided that the hook lists udev requirements in the .files config for it. --- main/postmarketos-mkinitfs/APKBUILD | 6 +++--- main/postmarketos-mkinitfs/init.sh | 1 + main/postmarketos-mkinitfs/init_functions.sh | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index b6a1ebf6f..635cca818 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Clayton Craft pkgname=postmarketos-mkinitfs pkgver=1.5.1 -pkgrel=3 +pkgrel=4 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" depends=" @@ -67,6 +67,6 @@ check() { sha512sums=" d28802b17d7912a58d23c02fbdddfdb6f74489e712d61a59472f7f000a4429786f69ba2fca59d321c55c277ff79edb6f47c939a9e973b31f694aeca0167354ff postmarketos-mkinitfs-1.5.1.tar.gz 20f110337113e8de8999cf2a064a93fea36821d5c216bfa4ba46ec1f83825638262b92fd7be29eee0a85a54a108b7315a96cbe30da8ae4419f54c2ed53bb08c7 00-default.modules -ccdceaa710d97d6f57d8d66bfcbec448486d08083341712303f62123039f729229b88528308e411a308a2b90b81b60de89fe91143a6facbb11cbc9b4055eeaec init.sh -4006679c81d48245877988d5f5e94db68afe6896b6ab41f0f0d7d34c12a6674fe633975a89cee707e64c07cf01ad151694e27a34948df3b65c1e6be99036f0d0 init_functions.sh +92397322bea64ab5e4dfcd572ddad361b55bd5b59cfb34d5e143416a2ae80182b2d14cdeb0b8b25216792495827922cd5ab6bfa8ed720a79359975293a662630 init.sh +bf9787338df2ad90f1f9c80d88b91bbd5f394fef27cf588ed9a2b7a1e5550cc6b89ea8755c789dd182b23b8d86cbcf8f9b76b12e126a5a67f0b0ba1c315c1850 init_functions.sh " diff --git a/main/postmarketos-mkinitfs/init.sh b/main/postmarketos-mkinitfs/init.sh index 9ef7593ec..23604fee5 100644 --- a/main/postmarketos-mkinitfs/init.sh +++ b/main/postmarketos-mkinitfs/init.sh @@ -38,6 +38,7 @@ start_unudhcpd mount_boot_partition /boot show_splash_loading extract_initramfs_extra /boot/initramfs-extra +setup_udev # charging-sdl does not work properly at the moment, so skip it. # See also https://gitlab.com/postmarketOS/pmaports/-/issues/1064 # start_charging_mode diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 92e27d407..5ff499026 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -62,10 +62,12 @@ setup_firmware_path() { setup_mdev() { # Start mdev daemon mdev -d +} - # If udevd and udevadm are present in the initfs, coldplug all devices so that - # they can be used via libinput (e.g. by unl0kr). This is the same series of steps - # performed by the udev, udev-trigger and udev-settle RC services. See also: +setup_udev() { + # Use udev to coldplug all devices so that they can be used via libinput (e.g. + # by unl0kr). This is the same series of steps performed by the udev, + # udev-trigger and udev-settle RC services. See also: # - https://git.alpinelinux.org/aports/tree/main/eudev/setup-udev # - https://git.alpinelinux.org/aports/tree/main/udev-init-scripts/APKBUILD if command -v udevd > /dev/null && command -v udevadm > /dev/null; then