Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

main/postmarketos-initramfs: stop unudhcpd before switching rootfs

Browse source 
Rootfs will take over the managing of unudhcpd under the service manager,
stop unudhpcd to allow this and avoiding multiple instances.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8553>
This commit is contained in:
Dylan Van Assche 2026-05-24 18:59:44 +02:00 • committed by The Friendly Meow (merge) Bot
parent 7a917eee3c
commit 41732e213b
No known key found for this signature in database
3 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/postmarketos-initramfs/APKBUILD
View file

@ -1,8 +1,8 @@
# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
maintainer="Casey Connolly <kcxt@postmarketos.org>"
pkgname=postmarketos-initramfs
pkgver=3.11.2
pkgrel=1
pkgver=3.12.0
pkgrel=0
pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
url="https://postmarketos.org"
options="!check" # no tests
@ -112,8 +112,8 @@ ace852ba267b3408998970df6042603c8bec1d033066d1c30ed65f1be955fee8644b57882898f102
69852928464f01757e2f473bd2c2e7ecb4132ecf3e26bdec95932e928dfe9042f59316e0a509fd38bcda88e24dd94bf33e8a88118b5adbec7023d1c13da12f59 00-initramfs-base.files
6d91270b96ce0c745391174201dde63b43a73ae6456c2e1138046beef3548580588fedbeae7cc914079162e99343b45d82c6e6a7ee1d03829aae7697ae52f575 00-initramfs-extra-base.files
bd72e8b6345a46ec13516c64d78d4fa1a9a18a8db9ab04aac605f9708629453dc65b6fbccd96b58eeb1ea68102ddbcae9dc6b369255c6c6c1fb18ce0bd43ec79 init.sh
73a4f59264881d299ed05a97602e053e68e4db91f97cf2cde63e5fb8b57802ae2c2a4a169eabb241fca66c035968024cfca74cfbeacf5c5b8e7269af5db3eba2 init_functions.sh
09cf0fcd415a20f421c5b56ac39c273a8ad9467260eee056c6c5e79c7ac1352fbdf73ab6e9620d4a314d876d7908ebac869faa34d11a96b296520388ddc36e8e init_2nd.sh
1c1518e903a1d08fe6eed85534fe84d12f43bb5fbfbca97de8aed78f30ddf96ebc2391d39eab02d8689549ca1367f422182995a26e5fda284afea024c433b1b9 init_functions.sh
7aa82d5e2907470d667612643d98371dff27b2650051f8c568ab43d1b97677362c3e6fbd442474086d681ea7c0cfbcaf269d3eef2d2dc3ff4ebf17c786b82148 init_2nd.sh
4eca94327274511011967cde1f663b00b1a8182f7dddc3ba19d5c1f0ac094087a154a250c140ca70ac75a2e7c5bb70b03e94fa5eca63a5393efc4a23d025e1c3 init_functions_2nd.sh
675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf
"

5
main/postmarketos-initramfs/init_2nd.sh
View file

@ -88,10 +88,7 @@ if [ "$IN_CI" != "true" ]; then
beebzzr &
fi
killall udevd syslogd 2>/dev/null
# kill unudhpcd to allow rootfs to take over with service manager
stop_unudhpcd
killall udevd syslogd unudhcpd 2>/dev/null
# Kill any getty shells that might be running
for pid in $(pidof sh); do

4
main/postmarketos-initramfs/init_functions.sh
View file

@ -1056,10 +1056,12 @@ debug_shell() {
local have_udc
have_udc="$(cat $CONFIGFS/g1/UDC)"
# Use USB ACM gadget if no UDC is available,
# if UDC is available use configured USB networking,
# but DHCP server needs to be started
if [ -n "$have_udc" ]; then
setup_usb_acm_configfs
else
# USB networking was configured, but DHCP server needs to be started
start_unudhcpd
fi