From 24184654b2daafa8830c10cd0245ae761efc8702 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 13 Mar 2026 23:10:11 -0700 Subject: [PATCH] main/postmarketos-initramfs: change configfs mount point This matches the path that systemd's sys-kernel-config.mount unit uses, and imho it's a lot nicer to tuck the mount point under /sys/kernel (like for debugfs) than to have it in / Signed-off-by: Clayton Craft Part-of: --- main/postmarketos-initramfs/APKBUILD | 4 ++-- main/postmarketos-initramfs/init_functions.sh | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD index 032bb1bda..4ff2ae804 100644 --- a/main/postmarketos-initramfs/APKBUILD +++ b/main/postmarketos-initramfs/APKBUILD @@ -1,7 +1,7 @@ # Co-Maintainer: Clayton Craft maintainer="Casey Connolly " pkgname=postmarketos-initramfs -pkgver=3.9.4 +pkgver=3.9.5 pkgrel=0 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra" url="https://postmarketos.org" @@ -120,7 +120,7 @@ ace852ba267b3408998970df6042603c8bec1d033066d1c30ed65f1be955fee8644b57882898f102 26e391a2c45e4317549153630d7398f01cf374d9a95e2587f0f7153017c50b6640950af60eab3b3fcadef2e8826295445ac1f45567716d3bd5d12e9c87df599b 00-initramfs-base.files cc4db00caba184ad78062505415b3dadb8a32a94fe8484e4860bb6e63cd8700c8450066ce1242c496d9f063234bbab0fa40668f9c5112f3baeee30c5d405a1eb 00-initramfs-extra-base.files e90596540805662211bd2a2e427ce7cc38f6a30023267f902e23f2bae136b6cd8f4f4716b8fb611be9d671a964edd2ecce03fa32bc8024e29b8375b0097fde0c init.sh -ce1361157eed25045e58a98fa9d68630198d6b671e335992c56e6fbc6f08b32ffa50804eefd8d9768a1475ffddd1244f56e2c82c8fa4b81227ab5420ba488264 init_functions.sh +ba00a507e26976e438db3125edb016ecae63cff1829ba2b341b521f8678d89f6894f0be5b0964204857384bf1c17a49445ef16f91ed1535f4066ec7718e346cf init_functions.sh 55634e5388394acc86a7ba245c35f1f07aff6e352d6973df6a62483ac70485c5b889828c52ff4067049ec4f825174cf0073a77a373f8048c4e252d6811299756 init_2nd.sh 61acb470a163fb50ad46752781b5ccc5dba6db9170e4250b4dcdfc7572d0316a7a36bc5a383026887a7a59364ee30917790e429b3fce9de590543d1d8410589c init_functions_2nd.sh 675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf diff --git a/main/postmarketos-initramfs/init_functions.sh b/main/postmarketos-initramfs/init_functions.sh index d30ea392e..f517ad7af 100644 --- a/main/postmarketos-initramfs/init_functions.sh +++ b/main/postmarketos-initramfs/init_functions.sh @@ -9,7 +9,7 @@ PMOS_ROOT="${PMOS_ROOT:-}" SUBPARTITION_DEV="${SUBPARTITION_DEV:-}" SUBPARTITION_LOOP="${SUBPARTITION_LOOP:-}" -CONFIGFS="/config/usb_gadget" +CONFIGFS="/sys/kernel/config/usb_gadget" CONFIGFS_ACM_FUNCTION="acm.usb0" CONFIGFS_MASS_STORAGE_FUNCTION="mass_storage.0" HOST_IP="${unudhcpd_host_ip:-172.16.42.1}" @@ -269,8 +269,8 @@ mount_proc_sys_dev() { mount -t devtmpfs -o mode=0755,nosuid dev /dev || echo "Couldn't mount /dev" mount -t tmpfs -o nosuid,nodev,mode=0755 run /run || echo "Couldn't mount /run" - mkdir /config - mount -t configfs -o nodev,noexec,nosuid configfs /config + modprobe libcomposite 2>/dev/null || true + mount -t configfs -o nodev,noexec,nosuid configfs "$(dirname "$CONFIGFS")" # /dev/pts (needed for telnet) mkdir -p /dev/pts @@ -895,7 +895,6 @@ setup_usb_network() { [ -e "$_marker" ] && return touch "$_marker" info "Setup usb network" - modprobe libcomposite # Run all usb network setup functions (add more below!) setup_usb_network_android setup_usb_network_configfs