9afa387eea
(Includes partial revert of 8107ee642f9929e7e656fc52759816b51fbaef90.) - feat(resume): add device used for resume - fix(dracut): remove trailing null characters from SBATs when building UKIs - fix(network-legacy): replace `echo` writes with `printf` to prevent injection via DHCP - fix(iscsi): replace `echo` writes with `printf` to prevent variable injection - fix(network): warn on suspicious shell metacharacters in hostname file - fix(base): escape arguments in initqueue hook script generation - revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless excluded" Resolves: RHEL-119785,RHEL-140458,RHEL-170858,RHEL-178488
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 365b910c00331ba0c0734919e1ea8b5f8d2503ab Mon Sep 17 00:00:00 2001
|
|
From: Pavel Valena <pvalena@redhat.com>
|
|
Date: Wed, 24 Jun 2026 22:54:40 +0200
|
|
Subject: [PATCH] revert: "feat(i18n): pull 'drm' or 'simpledrm' module unless
|
|
excluded"
|
|
|
|
This reverts commit 35e125e0b8c013e759b4a1b819d73a99adcbf347.
|
|
|
|
Resolves: RHEL-178488
|
|
---
|
|
modules.d/10i18n/module-setup.sh | 23 +----------------------
|
|
1 file changed, 1 insertion(+), 22 deletions(-)
|
|
|
|
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
|
index 11aedb0c..35bda36f 100755
|
|
--- a/modules.d/10i18n/module-setup.sh
|
|
+++ b/modules.d/10i18n/module-setup.sh
|
|
@@ -11,28 +11,7 @@ check() {
|
|
|
|
# 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"
|
|
+ return 0
|
|
}
|
|
|
|
# called by dracut
|