From cb7bce13df964e09588a83341635f16e212f3f04 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Sun, 31 May 2026 19:04:22 +0200 Subject: [PATCH] main/postmarketos-initramfs: remove unudhcpd.conf Everything included in the unudhcpd.conf file is already the default in init_functions.sh. Adding the !optional key to the initramfs config allows these configs to be overwritten by users if need-be. Signed-off-by: Aster Boese Part-of: --- main/postmarketos-initramfs/00-initramfs-base.files | 2 +- main/postmarketos-initramfs/APKBUILD | 9 ++------- main/postmarketos-initramfs/unudhcpd.conf | 6 ------ 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 main/postmarketos-initramfs/unudhcpd.conf diff --git a/main/postmarketos-initramfs/00-initramfs-base.files b/main/postmarketos-initramfs/00-initramfs-base.files index fb6de695c..8996714d4 100644 --- a/main/postmarketos-initramfs/00-initramfs-base.files +++ b/main/postmarketos-initramfs/00-initramfs-base.files @@ -1,7 +1,7 @@ /bin/busybox /bin/busybox-extras /etc/deviceinfo!optional -/etc/unudhcpd.conf +/etc/unudhcpd.conf!optional /sbin/blkid /usr/bin/iskey /usr/bin/beebzzr diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD index 2129adc99..95bfbecf6 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.11.1 +pkgver=3.11.2 pkgrel=0 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra" url="https://postmarketos.org" @@ -49,7 +49,6 @@ source=" init_2nd.sh init_functions_2nd.sh mdev.conf - unudhcpd.conf " arch="noarch" license="GPL-2.0-or-later" @@ -63,9 +62,6 @@ build() { } package() { - install -Dm644 "$srcdir/unudhcpd.conf" \ - "$pkgdir/etc/unudhcpd.conf" - install -Dm644 "$srcdir"/mdev.conf \ -t "$pkgdir"/usr/share/initramfs/ @@ -112,12 +108,11 @@ sha512sums=" 22cdd663c8d153781284511140b7c994cd60f0231a2819dafa67f5a11e2963ac6e392e8f7a9e3b75e7fe5d6d7b0b5e262e1ff1a695637354a124560a5ec3ed8d 00-default.modules ace852ba267b3408998970df6042603c8bec1d033066d1c30ed65f1be955fee8644b57882898f10228ec43b912f8f03718b34ddd741b431e5a5c2e76f060a494 00-default-extra.modules 9c0e8f6f61d5da191e03a1aa9d5d0ceb5baf1eae6dbb9bfb0af59817783525119ac8394b135f303f7b6434a3eab0b49185fb90379e06823db847a4999c75ce33 00-initramfs-base.dirs -f43d7f9c3b5f4bcee610c2388a1b4602d609c515c894a16d07e6ef86d16678702a015584ce1bd9bfdea7b3b243bfcba6e5a212a07d3e7dabd37f12648ababbe3 00-initramfs-base.files +69852928464f01757e2f473bd2c2e7ecb4132ecf3e26bdec95932e928dfe9042f59316e0a509fd38bcda88e24dd94bf33e8a88118b5adbec7023d1c13da12f59 00-initramfs-base.files 6d91270b96ce0c745391174201dde63b43a73ae6456c2e1138046beef3548580588fedbeae7cc914079162e99343b45d82c6e6a7ee1d03829aae7697ae52f575 00-initramfs-extra-base.files bd72e8b6345a46ec13516c64d78d4fa1a9a18a8db9ab04aac605f9708629453dc65b6fbccd96b58eeb1ea68102ddbcae9dc6b369255c6c6c1fb18ce0bd43ec79 init.sh 85bc25e72ce67a2b9ae91bf5486707b35b8a118f527ae7d95f8ce45da5ec61bd77987f69963843a9db7baf692c5635a233f5fbada8417f545866bc4b95c32ba5 init_functions.sh 6201869d3731bdbe4330ffe1c6cf66ab48918b4693153e5ad648f87fa1a28c93095a218de66ce9b24d8f13df92042959591293b26fbc64279480a015ea23ce06 init_2nd.sh 4eca94327274511011967cde1f663b00b1a8182f7dddc3ba19d5c1f0ac094087a154a250c140ca70ac75a2e7c5bb70b03e94fa5eca63a5393efc4a23d025e1c3 init_functions_2nd.sh 675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf -ba3275a9af788c7c782322a22a0f144d5e50e3498ea6886486a29331f23ae89cd32d500a3635cfa7cab369afba92edc18aeca64ccbf0cd589061cce23d15b46c unudhcpd.conf " diff --git a/main/postmarketos-initramfs/unudhcpd.conf b/main/postmarketos-initramfs/unudhcpd.conf deleted file mode 100644 index 9fab1a84a..000000000 --- a/main/postmarketos-initramfs/unudhcpd.conf +++ /dev/null @@ -1,6 +0,0 @@ -# This configuration file is used by the initramfs to run unudhcpd. -# It is *not* used directly by unudhcpd! -# Note: The initramfs must be recreated by running the 'mkinitfs' command -# for changes here to be applied/used during boot. -unudhcpd_host_ip=172.16.42.1 -unudhcpd_client_ip=172.16.42.2