diff --git a/0037-revert-feat-i18n-pull-drm-or-simpledrm-module-unless.patch b/0037-revert-feat-i18n-pull-drm-or-simpledrm-module-unless.patch new file mode 100644 index 0000000..0172106 --- /dev/null +++ b/0037-revert-feat-i18n-pull-drm-or-simpledrm-module-unless.patch @@ -0,0 +1,53 @@ +From c84d8abec03fa787d2fcf69c4f19c5cf496a50cf Mon Sep 17 00:00:00 2001 +From: Pavel Valena +Date: Thu, 25 Jun 2026 06:42:49 +0200 +Subject: [PATCH 37/37] revert: "feat(i18n): pull 'drm' or 'simpledrm' module + unless excluded" + +This reverts commit a788f4c60c7a72185485952d24266581c9de2353. + +Resolves: RHEL-188272 +--- + modules.d/10i18n/module-setup.sh | 26 -------------------------- + 1 file changed, 26 deletions(-) + +diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh +index d39a5a72..4437f084 100755 +--- a/modules.d/10i18n/module-setup.sh ++++ b/modules.d/10i18n/module-setup.sh +@@ -9,32 +9,6 @@ check() { + return 0 + } + +-# called by dracut +-depends() { +- # Include "drm" / "simpledrm" to be able to set the console font properly +- local _module _drm +- local -a _modules=(drm simpledrm) +- +- for _module in "${_modules[@]}"; do +- if dracut_module_included "$_module"; then +- _drm="$_module" +- break +- fi +- done +- +- if [[ -z $_drm ]]; then +- for _module in "${_modules[@]}"; do +- module_check "$_module" > /dev/null 2>&1 +- if [[ $? == 255 ]] && ! [[ " $omit_dracutmodules " == *\ $_module\ * ]]; then +- _drm="$_module" +- break +- fi +- done +- fi +- +- echo "$_drm" +-} +- + # called by dracut + install() { + declare -A KEYMAPS +-- +2.54.0 + diff --git a/dracut.spec b/dracut.spec index 81fe34d..17ac233 100644 --- a/dracut.spec +++ b/dracut.spec @@ -8,7 +8,7 @@ Name: dracut Version: 107 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Initramfs generator using udev @@ -130,6 +130,9 @@ Patch35: 0035-fix-net-lib-warn-on-suspicious-shell-metacharacters-.patch # fix(systemd-networkd): escape DHCP lease values in dhcpopts generation # Author: Pavel Valena Patch36: 0036-fix-systemd-networkd-escape-DHCP-lease-values-in-dhc.patch +# revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless excluded" +# Author: Pavel Valena +Patch37: 0037-revert-feat-i18n-pull-drm-or-simpledrm-module-unless.patch # Please use source-git to work with this spec file: # HowTo: https://packit.dev/source-git/work-with-source-git @@ -552,6 +555,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/ %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install %changelog +* Thu Jun 25 2026 Pavel Valena - 107-8 +- revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless excluded" + * Wed May 27 2026 Pavel Valena - 107-7 - build: rebuild without an obsoleted patch