diff --git a/33861.patch b/33861.patch deleted file mode 100644 index b443387..0000000 --- a/33861.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1310492f7a58db4315390db174da65aef699aa91 Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Mon, 29 Jul 2024 15:41:51 +0200 -Subject: [PATCH] kernel-install: Try some more initrd variants in - 90-loaderentry.install - -On CentOS/Fedora, dracut is configured to write the initrd to -/boot/initramfs-$KERNEL_VERSION...img so let's check for that as well -if no initrds were supplied. ---- - src/kernel-install/90-loaderentry.install.in | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in -index 4ef6aca169c1a..84f7a4a97fb43 100755 ---- a/src/kernel-install/90-loaderentry.install.in -+++ b/src/kernel-install/90-loaderentry.install.in -@@ -205,8 +205,18 @@ mkdir -p "${LOADER_ENTRY%/*}" || { - have_initrd=yes - done - -- # Try "initrd", generated by dracut in its kernel-install hook, if no initrds were supplied -- [ -z "$have_initrd" ] && [ -f "$ENTRY_DIR_ABS/initrd" ] && echo "initrd $ENTRY_DIR/initrd" -+ # Try a few variations that are generated by various initrd generators in their kernel-install hooks if -+ # no initrds were supplied. -+ -+ if [ -z "$have_initrd" ] && [ -f "$ENTRY_DIR_ABS/initrd" ]; then -+ echo "initrd $ENTRY_DIR/initrd" -+ have_initrd=yes -+ fi -+ -+ if [ -z "$have_initrd" ] && [ -f "$BOOT_ROOT/initramfs-$KERNEL_VERSION.img" ]; then -+ echo "initrd /initramfs-$KERNEL_VERSION.img" -+ have_initrd=yes -+ fi - : - } >"$LOADER_ENTRY" || { - echo "Error: could not create loader entry '$LOADER_ENTRY'." >&2 diff --git a/33864.patch b/33864.patch deleted file mode 100644 index 290af4c..0000000 --- a/33864.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 94a2999f250e3f7579883f5c79815b80398043cd Mon Sep 17 00:00:00 2001 -From: Daan De Meyer -Date: Mon, 29 Jul 2024 17:13:28 +0200 -Subject: [PATCH] kernel-install: Only read cmdline from /proc/cmdline when not - in container - -If we're running from within a container, we're very likely not going -to want to use the kernel command line from /proc/cmdline, so let's add -a check to see if we're running from a container to decide whether we'll -use the kernel command line from /proc/cmdline. ---- - src/kernel-install/90-loaderentry.install.in | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in -index 4ef6aca169c1a..79427684cc5c9 100755 ---- a/src/kernel-install/90-loaderentry.install.in -+++ b/src/kernel-install/90-loaderentry.install.in -@@ -79,8 +79,10 @@ elif [ -f /etc/kernel/cmdline ]; then - BOOT_OPTIONS="$(tr -s "$IFS" ' ' = 10 Requires: (grubby > 8.40-72 if grubby) Requires: (sdubby > 1.0-3 if sdubby) +%endif # A backport of systemd-timesyncd is shipped as a separate package in EPEL so # let's make sure we properly handle that. %if 0%{?rhel} @@ -494,7 +493,9 @@ Requires: python3dist(pefile) Requires: python3dist(zstd) %endif Requires: python3dist(cryptography) +%if 0%{?fedora} Recommends: python3dist(pillow) +%endif # for tests %ifarch riscv64 @@ -1012,6 +1013,13 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/ rm %{buildroot}/usr/lib/sysusers.d/basic.conf %endif +# Disable sshd_config.d/20-systemd-userdb.conf for now. +# This option may override an existing AuthorizedKeysCommand setting +# (or be ineffective, depending on the order of configuration). +# See https://github.com/systemd/systemd/issues/33648. +rm %{buildroot}/etc/ssh/sshd_config.d/20-systemd-userdb.conf +mv %{buildroot}/usr/lib/tmpfiles.d/20-systemd-userdb.conf{,.example} + %find_lang %{name} # Split files in build root into rpms