mirror of
https://github.com/flatcar/scripts.git
synced 2026-04-16 11:02:04 +02:00
sys-kernel/dracut: Sync with Gentoo
It's from Gentoo commit ec3e612bac8bdb6e031eb3335c27cba4ccd11dcd. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
d2c3b19094
commit
51fdbe0a95
@ -1,3 +1,3 @@
|
||||
DIST dracut-106.tar.gz 527743 BLAKE2B 837621da329500b88b0c81a724990702a9f4e816a4818c26622b2bc5e3885c908f0bbba682a262f967d9a08a912cfd63a33270143560a30e3d067dc4217c5262 SHA512 ab17f9440129e2db7c2902115459309132ce7f7b29bbb3172002b7a8ea8ab54799d62d89fbf3f84581a5c14196f6754d33669b583b9d758ab4686a3443a3c4ad
|
||||
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
|
||||
|
||||
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"
|
||||
else
|
||||
if [[ "${PV}" != *_rc* ]]; then
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
|
||||
fi
|
||||
SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${PN}-ng-${PV}"
|
||||
@ -22,11 +22,15 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="dracut-cpio selinux test"
|
||||
IUSE="dracut-cpio selinux systemd test"
|
||||
RESTRICT="test"
|
||||
PROPERTIES="test? ( test_privileged test_network )"
|
||||
|
||||
RDEPEND="
|
||||
COMMON_DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
systemd? ( >=sys-apps/systemd-257:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-alternatives/cpio
|
||||
>=app-shells/bash-4.0:0
|
||||
sys-apps/coreutils[xattr(-)]
|
||||
@ -48,8 +52,7 @@ RDEPEND="
|
||||
sys-libs/libsepol
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
elibc_musl? ( sys-libs/fts-standalone )
|
||||
"
|
||||
|
||||
@ -135,6 +138,9 @@ src_configure() {
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# https://bugs.gentoo.org/968765
|
||||
use systemd || export SYSTEMD_CFLAGS= SYSTEMD_LIBS=
|
||||
|
||||
edo ./configure "${myconf[@]}"
|
||||
if use dracut-cpio; then
|
||||
cargo_gen_config
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -22,11 +22,15 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="dracut-cpio selinux test"
|
||||
IUSE="dracut-cpio selinux systemd test"
|
||||
RESTRICT="test"
|
||||
PROPERTIES="test? ( test_privileged test_network )"
|
||||
|
||||
RDEPEND="
|
||||
COMMON_DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
systemd? ( >=sys-apps/systemd-257:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-alternatives/cpio
|
||||
>=app-shells/bash-4.0:0
|
||||
sys-apps/coreutils[xattr(-)]
|
||||
@ -48,15 +52,14 @@ RDEPEND="
|
||||
sys-libs/libsepol
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
elibc_musl? ( sys-libs/fts-standalone )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
|| (
|
||||
dev-ruby/asciidoctor
|
||||
app-text/asciidoc
|
||||
dev-ruby/asciidoctor
|
||||
)
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
@ -129,6 +132,9 @@ src_configure() {
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# https://bugs.gentoo.org/968765
|
||||
use systemd || export SYSTEMD_CFLAGS= SYSTEMD_LIBS=
|
||||
|
||||
edo ./configure "${myconf[@]}"
|
||||
if use dracut-cpio; then
|
||||
cargo_gen_config
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/dracut-ng/dracut-ng"
|
||||
else
|
||||
if [[ "${PV}" != *_rc* ]]; then
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
fi
|
||||
SRC_URI="https://github.com/dracut-ng/dracut-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${PN}-ng-${PV}"
|
||||
@ -22,11 +22,15 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="dracut-cpio selinux test"
|
||||
IUSE="dracut-cpio selinux systemd test"
|
||||
RESTRICT="test"
|
||||
PROPERTIES="test? ( test_privileged test_network )"
|
||||
|
||||
RDEPEND="
|
||||
COMMON_DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
systemd? ( >=sys-apps/systemd-257:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-alternatives/cpio
|
||||
>=app-shells/bash-4.0:0
|
||||
sys-apps/coreutils[xattr(-)]
|
||||
@ -48,13 +52,15 @@ RDEPEND="
|
||||
sys-libs/libsepol
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
elibc_musl? ( sys-libs/fts-standalone )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
app-text/asciidoc
|
||||
|| (
|
||||
app-text/asciidoc
|
||||
dev-ruby/asciidoctor
|
||||
)
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
@ -99,11 +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}-106-acct-user-group-gentoo.patch
|
||||
# https://github.com/dracut-ng/dracut-ng/pull/1207
|
||||
"${FILESDIR}"/${PN}-106-fix-rngd-module.patch
|
||||
# https://github.com/dracut-ng/dracut-ng/pull/1250
|
||||
"${FILESDIR}"/${PN}-106-fix-mdraid-module.patch
|
||||
"${FILESDIR}"/${PN}-110-acct-user-group-gentoo.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@ -112,18 +114,26 @@ pkg_setup() {
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
--disable-dracut-cpio
|
||||
--enable-network-legacy
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--sysconfdir="${EPREFIX}/etc"
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
--systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--disable-dracut-cpio
|
||||
)
|
||||
|
||||
if ! has_version -b dev-ruby/asciidoctor; then
|
||||
myconf+=( --disable-asciidoctor )
|
||||
fi
|
||||
|
||||
# this emulates what the build system would be doing without us
|
||||
append-cflags -D_FILE_OFFSET_BITS=64
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# https://bugs.gentoo.org/968765
|
||||
use systemd || export SYSTEMD_CFLAGS= SYSTEMD_LIBS=
|
||||
|
||||
edo ./configure "${myconf[@]}"
|
||||
if use dracut-cpio; then
|
||||
cargo_gen_config
|
||||
@ -169,6 +179,9 @@ src_install() {
|
||||
exeinto /usr/lib/dracut
|
||||
doexe "src/dracut-cpio/$(cargo_target_dir)/dracut-cpio"
|
||||
fi
|
||||
|
||||
# Use our own from sys-kernel/installkernel[dracut]
|
||||
rm -r "${ED}/usr/lib/kernel" || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -22,11 +22,15 @@ HOMEPAGE="https://github.com/dracut-ng/dracut-ng/wiki"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="dracut-cpio selinux test"
|
||||
IUSE="dracut-cpio selinux systemd test"
|
||||
RESTRICT="test"
|
||||
PROPERTIES="test? ( test_privileged test_network )"
|
||||
|
||||
RDEPEND="
|
||||
COMMON_DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
systemd? ( >=sys-apps/systemd-257:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-alternatives/cpio
|
||||
>=app-shells/bash-4.0:0
|
||||
sys-apps/coreutils[xattr(-)]
|
||||
@ -48,15 +52,14 @@ RDEPEND="
|
||||
sys-libs/libsepol
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
>=sys-apps/kmod-23
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
elibc_musl? ( sys-libs/fts-standalone )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
|| (
|
||||
dev-ruby/asciidoctor
|
||||
app-text/asciidoc
|
||||
dev-ruby/asciidoctor
|
||||
)
|
||||
app-text/docbook-xml-dtd:4.5
|
||||
>=app-text/docbook-xsl-stylesheets-1.75.2
|
||||
@ -102,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() {
|
||||
@ -113,11 +114,12 @@ pkg_setup() {
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
--disable-dracut-cpio
|
||||
--enable-network-legacy
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--sysconfdir="${EPREFIX}/etc"
|
||||
--bashcompletiondir="$(get_bashcompdir)"
|
||||
--systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
--disable-dracut-cpio
|
||||
)
|
||||
|
||||
if ! has_version -b dev-ruby/asciidoctor; then
|
||||
@ -129,6 +131,9 @@ src_configure() {
|
||||
|
||||
tc-export CC PKG_CONFIG
|
||||
|
||||
# https://bugs.gentoo.org/968765
|
||||
use systemd || export SYSTEMD_CFLAGS= SYSTEMD_LIBS=
|
||||
|
||||
edo ./configure "${myconf[@]}"
|
||||
if use dracut-cpio; then
|
||||
cargo_gen_config
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
From https://github.com/dracutdevs/dracut/pull/2527
|
||||
From a2fe89116db4b286fbf515f26bd1773b5e6ee8ad Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
||||
Date: Tue, 26 Sep 2023 09:43:37 +0200
|
||||
Subject: [PATCH] fix(resume): add new systemd-hibernate-resume.service
|
||||
|
||||
Since https://github.com/systemd/systemd/commit/a628d933, the generator only
|
||||
does the initial validation of the system info and then enables the new
|
||||
`systemd-hibernate-resume.service`.
|
||||
|
||||
Fixes #2513
|
||||
--- a/modules.d/95resume/module-setup.sh
|
||||
+++ b/modules.d/95resume/module-setup.sh
|
||||
@@ -44,6 +44,7 @@ install() {
|
||||
if dracut_module_included "systemd" && [[ -x $dracutsysrootdir$systemdutildir/systemd-hibernate-resume ]]; then
|
||||
inst_multiple -o \
|
||||
"$systemdutildir"/system-generators/systemd-hibernate-resume-generator \
|
||||
+ "$systemdsystemunitdir"/systemd-hibernate-resume.service \
|
||||
"$systemdsystemunitdir"/systemd-hibernate-resume@.service \
|
||||
"$systemdutildir"/systemd-hibernate-resume
|
||||
return 0
|
||||
@ -1,65 +0,0 @@
|
||||
https://bugs.gentoo.org/917000
|
||||
https://github.com/dracutdevs/dracut/pull/2494
|
||||
|
||||
From b88d0bab791bdc4ca75d13802f0391caf537650d Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
|
||||
Date: Sun, 20 Aug 2023 11:47:22 +0200
|
||||
Subject: [PATCH] fix(resume): include in hostonly mode if resume= on cmdline
|
||||
|
||||
The grep introduced in commit e3a7112bef794e2f2dd741ec2c74fa9cb9117651
|
||||
does not work as intended. The resume module is always excluded in hostonly
|
||||
mode.
|
||||
|
||||
Made this a bit more explicit with if/else so it is more clear what is going
|
||||
on. The in-line ||/&& makes the line really long and makes it more difficult
|
||||
to understand what is going on.
|
||||
|
||||
Bug: https://github.com/dracutdevs/dracut/issues/924
|
||||
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
|
||||
---
|
||||
modules.d/95resume/module-setup.sh | 32 +++++++++++++++++++++++-------
|
||||
1 file changed, 25 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
|
||||
index d255103366..2d48043827 100755
|
||||
--- a/modules.d/95resume/module-setup.sh
|
||||
+++ b/modules.d/95resume/module-setup.sh
|
||||
@@ -10,13 +10,31 @@ check() {
|
||||
return 1
|
||||
}
|
||||
|
||||
- # Only support resume if hibernation is currently on
|
||||
- # and no swap is mounted on a net device
|
||||
- [[ $hostonly ]] || [[ $mount_needs ]] && {
|
||||
- swap_on_netdevice || [[ -f /sys/power/resume && "$(< /sys/power/resume)" == "0:0" ]] || grep -rq '^\|[[:space:]]resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null && return 255
|
||||
- }
|
||||
-
|
||||
- return 0
|
||||
+ # If hostonly check if we want to include the resume module
|
||||
+ if [[ $hostonly ]] || [[ $mount_needs ]]; then
|
||||
+ # Resuming won't work if swap is on a netdevice
|
||||
+ swap_on_netdevice && return 255
|
||||
+ if grep -rq 'resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null; then
|
||||
+ # hibernation support requested on kernel command line
|
||||
+ return 0
|
||||
+ else
|
||||
+ # resume= not set on kernel command line
|
||||
+ if [[ -f /sys/power/resume ]]; then
|
||||
+ if [[ "$(< /sys/power/resume)" == "0:0" ]]; then
|
||||
+ # hibernation supported by the kernel, but not enabled
|
||||
+ return 255
|
||||
+ else
|
||||
+ # hibernation supported by the kernel and enabled
|
||||
+ return 0
|
||||
+ fi
|
||||
+ else
|
||||
+ # resume file doesn't exist, hibernation not supported by kernel
|
||||
+ return 255
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ return 0
|
||||
+ fi
|
||||
}
|
||||
|
||||
# called by dracut
|
||||
@ -1,31 +0,0 @@
|
||||
Ensures that the generated initrd is installed in the "new" way via the
|
||||
staging area in the grub layout. This prevents accidentally creating
|
||||
an UKI named initrd, and also ensures that BOOT_ROOT and
|
||||
KERNEL_INSTALL_INITRD_GENERATOR are respected when the layout is set to grub.
|
||||
|
||||
Downstream only since the grub layout for using grub with systemd's
|
||||
kernel-install is not supported by systemd upstream and therefore this
|
||||
patch is unlikely to be accepted by dracut upstream.
|
||||
|
||||
diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
|
||||
index 441414ac..a98449fe 100755
|
||||
--- a/install.d/50-dracut.install
|
||||
+++ b/install.d/50-dracut.install
|
||||
@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; t
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
+elif [[ $KERNEL_INSTALL_LAYOUT == "grub" || $KERNEL_INSTALL_LAYOUT == "compat" || $KERNEL_INSTALL_LAYOUT == "efistub" ]]; then
|
||||
+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
|
||||
+ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
|
||||
+ IMAGE="uki.efi"
|
||||
+ UEFI_OPTS="--uefi"
|
||||
+ elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
|
||||
+ IMAGE="initrd"
|
||||
+ UEFI_OPTS="--no-uefi"
|
||||
+ else
|
||||
+ exit 0
|
||||
+ fi
|
||||
else
|
||||
# No layout information, use users --uefi/--no-uefi preference
|
||||
UEFI_OPTS=""
|
||||
@ -1,26 +0,0 @@
|
||||
https://github.com/dracutdevs/dracut/pull/2586/files
|
||||
diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh
|
||||
index fa960a42c1..87efd0c1a6 100755
|
||||
--- a/modules.d/01systemd-pcrphase/module-setup.sh
|
||||
+++ b/modules.d/01systemd-pcrphase/module-setup.sh
|
||||
@@ -6,7 +6,11 @@
|
||||
check() {
|
||||
|
||||
# If the binary(s) requirements are not fulfilled the module can't be installed.
|
||||
- require_binaries "$systemdutildir"/systemd-pcrphase || return 1
|
||||
+ # systemd-255 renamed the binary, check for old and new location.
|
||||
+ if ! require_binaries "$systemdutildir"/systemd-pcrphase && \
|
||||
+ ! require_binaries "$systemdutildir"/systemd-pcrextend; then
|
||||
+ return 1
|
||||
+ fi
|
||||
|
||||
# Return 255 to only include the module, if another module requires it.
|
||||
return 255
|
||||
@@ -28,6 +32,7 @@ install() {
|
||||
|
||||
inst_multiple -o \
|
||||
"$systemdutildir"/systemd-pcrphase \
|
||||
+ "$systemdutildir"/systemd-pcrextend \
|
||||
"$systemdsystemunitdir"/systemd-pcrphase-initrd.service \
|
||||
"$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \
|
||||
"$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/dracut-init.sh b/dracut-init.sh
|
||||
index 986da96b..bd47bc92 100755
|
||||
--- a/dracut-init.sh
|
||||
+++ b/dracut-init.sh
|
||||
@@ -711,10 +711,10 @@ inst_libdir_file() {
|
||||
|
||||
# install sysusers files
|
||||
inst_sysusers() {
|
||||
- inst_multiple -o "$sysusers/$*"
|
||||
+ inst_multiple -o "$sysusers/acct-*-$*"
|
||||
|
||||
if [[ $hostonly ]]; then
|
||||
- inst_multiple -H -o "$sysusersconfdir/$*"
|
||||
+ inst_multiple -H -o "$sysusersconfdir/acct-*-$*"
|
||||
fi
|
||||
}
|
||||
|
||||
diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
|
||||
index 4441f552..4b5654d5 100755
|
||||
--- a/modules.d/91tpm2-tss/module-setup.sh
|
||||
+++ b/modules.d/91tpm2-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_multiple -o \
|
||||
"$tmpfilesdir"/tpm2-tss-fapi.conf \
|
||||
@ -1,21 +0,0 @@
|
||||
From 921792f201e954de461d3b551e01b5369d666db8 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
||||
Date: Tue, 10 Sep 2024 15:51:46 +0200
|
||||
Subject: [PATCH] feat(systemd): always install libsystemd libraries
|
||||
|
||||
---
|
||||
modules.d/00systemd/module-setup.sh | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
|
||||
index 498cd7edd..fb8a8200b 100755
|
||||
--- a/modules.d/00systemd/module-setup.sh
|
||||
+++ b/modules.d/00systemd/module-setup.sh
|
||||
@@ -156,5 +156,6 @@ EOF
|
||||
_arch=${DRACUT_ARCH:-$(uname -m)}
|
||||
inst_libdir_file \
|
||||
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
|
||||
- {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
|
||||
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \
|
||||
+ {"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so"
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Tsoy <alexander@tsoy.me>
|
||||
Date: Tue, 16 Jul 2024 08:48:54 +0300
|
||||
Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules
|
||||
module
|
||||
|
||||
libkmod library should be installed even if systemd module is
|
||||
omitted, so move its installation to udev-rules module.
|
||||
---
|
||||
modules.d/00systemd/module-setup.sh | 1 -
|
||||
modules.d/95udev-rules/module-setup.sh | 6 +++++-
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
|
||||
index ce7bb520c..e4fb9a586 100755
|
||||
--- a/modules.d/00systemd/module-setup.sh
|
||||
+++ b/modules.d/00systemd/module-setup.sh
|
||||
@@ -171,6 +171,5 @@ EOF
|
||||
_arch=${DRACUT_ARCH:-$(uname -m)}
|
||||
inst_libdir_file \
|
||||
{"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
|
||||
- {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
|
||||
{"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
|
||||
}
|
||||
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
|
||||
index d82ed5eb9..6078751f6 100755
|
||||
--- a/modules.d/95udev-rules/module-setup.sh
|
||||
+++ b/modules.d/95udev-rules/module-setup.sh
|
||||
@@ -93,7 +93,11 @@ install() {
|
||||
"${udevdir}"/usb_id \
|
||||
"${udevdir}"/v4l_id
|
||||
|
||||
- inst_libdir_file "libnss_files*"
|
||||
+ # Install required libraries.
|
||||
+ _arch=${DRACUT_ARCH:-$(uname -m)}
|
||||
+ inst_libdir_file \
|
||||
+ {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
|
||||
+ {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*"
|
||||
|
||||
# Install the hosts local user configurations if enabled.
|
||||
if [[ $hostonly ]]; then
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
|
||||
index 4441f5528..4b5654d56 100755
|
||||
--- a/modules.d/91tpm2-tss/module-setup.sh
|
||||
+++ b/modules.d/91tpm2-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_multiple -o \
|
||||
"$tmpfilesdir"/tpm2-tss-fapi.conf \
|
||||
@ -1,17 +0,0 @@
|
||||
https://github.com/dracut-ng/dracut-ng/pull/1250
|
||||
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
|
||||
index 8ce5f2ee..b0ab8411 100755
|
||||
--- a/modules.d/90mdraid/module-setup.sh
|
||||
+++ b/modules.d/90mdraid/module-setup.sh
|
||||
@@ -46,7 +46,7 @@ cmdline() {
|
||||
[[ ${host_fs_types[$dev]} != *_raid_member ]] && continue
|
||||
|
||||
UUID=$(
|
||||
- /sbin/mdadm --examine --export "$dev" \
|
||||
+ mdadm --examine --export "$dev" \
|
||||
| while read -r line || [[ "$line" ]]; do
|
||||
[[ ${line#MD_UUID=} == "$line" ]] && continue
|
||||
printf "%s" "${line#MD_UUID=} "
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
https://github.com/dracut-ng/dracut-ng/pull/1207
|
||||
diff --git a/modules.d/06rngd/module-setup.sh b/modules.d/06rngd/module-setup.sh
|
||||
index 1fcc831c4..064379242 100755
|
||||
--- a/modules.d/06rngd/module-setup.sh
|
||||
+++ b/modules.d/06rngd/module-setup.sh
|
||||
@@ -21,7 +21,7 @@
|
||||
check() {
|
||||
# if there's no rngd binary, no go.
|
||||
require_binaries rngd || return 1
|
||||
- require_binaries "${systemdsystemunitdir}/rngd.service" || return 1
|
||||
+ [[ -e "${systemdsystemunitdir}/rngd.service" ]] || return 1
|
||||
|
||||
return 0
|
||||
}
|
||||
@ -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"
|
||||
Loading…
x
Reference in New Issue
Block a user