commit:     854dde2be78ab3b180bdd61753e852f31f99cd2d
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  9 16:05:18 2026 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Feb  9 17:16:55 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854dde2b

sys-kernel/dracut: add 110

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 sys-kernel/dracut/Manifest                                  |  1 +
 sys-kernel/dracut/{dracut-9999.ebuild => dracut-110.ebuild} |  4 +---
 sys-kernel/dracut/dracut-9999.ebuild                        |  4 +---
 .../dracut/files/dracut-110-acct-user-group-gentoo.patch    | 13 +++++++++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 07260e9a3916..a676a2498af1 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,2 +1,3 @@
 DIST dracut-108.tar.gz 552724 BLAKE2B 
fa5efd4039be8d2d30564a0768d2dec8c3d72b3721391d3a02bde8445cd7a5766d4b119594ebbca86dbd59bd71b64353febaaa7e2257f02d0075333dc29e9047
 SHA512 
ed06844b65003c1f75373309dbdc10a3036958f413b05b608510142fa78bb34dd9fb1e622242b02b2e9e4063bfa916fd755f5131a77fb3249f77d3f08eca2283
 DIST dracut-109.tar.gz 556054 BLAKE2B 
a5cc0a954fdacaca036d926eb37ecc1c5ed244f59078afb3d59f464f84cf109d52b61ef3ef58eb182164b491d87f8b81a8946c591f0207a44ecd6a6411f018e5
 SHA512 
c1fb0191911b3b3eac4f568db1cbc8184e2b518a70a0567777b72ef8a5af70a8bdb1b3f8acce2d92eb2dc807e056d5b75aed93292cd05bc8c333efe5d4b98adc
+DIST dracut-110.tar.gz 573501 BLAKE2B 
e82e9db9767bb3e02f13536b26b97a0db94a567980c17e356054015ab3108946b35f7d993864f2ffded3dd0915ee5853df21b7e40ce20a4df5a81a5014a73ee5
 SHA512 
be5affbe1c76889c0ffe3ae6c52704b559e364cfa5fa149e07a0bbe5e373c7e8c4b54e4a20e7564c91750c8e1593f7cd108806cf63053c8e30d143246e549597

diff --git a/sys-kernel/dracut/dracut-9999.ebuild 
b/sys-kernel/dracut/dracut-110.ebuild
similarity index 97%
copy from sys-kernel/dracut/dracut-9999.ebuild
copy to sys-kernel/dracut/dracut-110.ebuild
index 59515121d453..e95f6d9453fc 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-110.ebuild
@@ -105,9 +105,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 PATCHES=(
        "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
        # Gentoo specific acct-user and acct-group conf adjustments
-       "${FILESDIR}"/${PN}-108-acct-user-group-gentoo.patch
-       # 
https://github.com/dracut-ng/dracut-ng/pull/1122#issuecomment-3192110686
-       "${FILESDIR}"/${PN}-108-disable-ukify-magic.patch
+       "${FILESDIR}"/${PN}-110-acct-user-group-gentoo.patch
 )
 
 pkg_setup() {

diff --git a/sys-kernel/dracut/dracut-9999.ebuild 
b/sys-kernel/dracut/dracut-9999.ebuild
index 59515121d453..e95f6d9453fc 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -105,9 +105,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 PATCHES=(
        "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
        # Gentoo specific acct-user and acct-group conf adjustments
-       "${FILESDIR}"/${PN}-108-acct-user-group-gentoo.patch
-       # 
https://github.com/dracut-ng/dracut-ng/pull/1122#issuecomment-3192110686
-       "${FILESDIR}"/${PN}-108-disable-ukify-magic.patch
+       "${FILESDIR}"/${PN}-110-acct-user-group-gentoo.patch
 )
 
 pkg_setup() {

diff --git a/sys-kernel/dracut/files/dracut-110-acct-user-group-gentoo.patch 
b/sys-kernel/dracut/files/dracut-110-acct-user-group-gentoo.patch
new file mode 100644
index 000000000000..4bfa98efbe7b
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-110-acct-user-group-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/modules.d/73tpm2-tss/module-setup.sh 
b/modules.d/73tpm2-tss/module-setup.sh
+index 4441f5528..4b5654d56 100755
+--- a/modules.d/73tpm2-tss/module-setup.sh
++++ b/modules.d/73tpm2-tss/module-setup.sh
+@@ -30,7 +30,7 @@ installkernel() {
+ 
+ # Install the required file(s) and directories for the module in the 
initramfs.
+ install() {
+-    inst_sysusers tpm2-tss.conf
++    inst_sysusers tss.conf
+     inst_sysusers system-user-tss.conf
+     grep -s '^tss:' "${dracutsysrootdir-}"/etc/passwd >> "$initdir/etc/passwd"
+     grep -s '^tss:' "${dracutsysrootdir-}"/etc/group >> "$initdir/etc/group"

Reply via email to