8107ee642f
- fix(multipath): disable user_friendly_names with mpathconf - fix(pcsc): add opensc load module file - fix(pcsc): add --disable-polkit to pcscd.service - fix(pkcs11): delete trailing dot on libcryptsetup-token-systemd-pkcs11.so - fix(systemd-repart): allow partition format - feat(install.d):according to the changes of systemd/systemd#37897, When --entry-type=type2 is used (for UKI), will not remove normal kernel IMAGE. Resolves: https://issues.redhat.com/browse/RHEL-103974 - feat(i18n): pull 'drm' or 'simpledrm' module unless excluded Resolves: RHEL-103385,RHEL-103974,RHEL-109631,RHEL-145135,RHEL-91322
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From 35e125e0b8c013e759b4a1b819d73a99adcbf347 Mon Sep 17 00:00:00 2001
|
|
From: Pavel Valena <pvalena@redhat.com>
|
|
Date: Tue, 6 Jan 2026 17:59:48 +0100
|
|
Subject: [PATCH] feat(i18n): pull 'drm' or 'simpledrm' module unless excluded
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Some graphic cards require the 'drm' module to be present to be able to
|
|
setup the console font (e.g. 'i915' requires it).
|
|
|
|
Also avoid conflicts of 'drm' with 'simpledrm' module.
|
|
|
|
Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
|
|
Co-authored-by: Renaud Métrich <rmetrich@redhat.com>
|
|
|
|
(cherry picked from commit d56b581f3ed3e788d8950cce710c6733a08e9d23)
|
|
|
|
Resolves: RHEL-145135
|
|
---
|
|
modules.d/10i18n/module-setup.sh | 23 ++++++++++++++++++++++-
|
|
1 file changed, 22 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
|
|
index 35bda36f..11aedb0c 100755
|
|
--- a/modules.d/10i18n/module-setup.sh
|
|
+++ b/modules.d/10i18n/module-setup.sh
|
|
@@ -11,7 +11,28 @@ check() {
|
|
|
|
# called by dracut
|
|
depends() {
|
|
- return 0
|
|
+ # 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
|