diff --git a/dracut-057-i18n-fix-adding-keymaps-includes.patch b/dracut-057-i18n-fix-adding-keymaps-includes.patch new file mode 100644 index 0000000..dd8d26a --- /dev/null +++ b/dracut-057-i18n-fix-adding-keymaps-includes.patch @@ -0,0 +1,11 @@ +--- dracut-057/modules.d/10i18n/module-setup.sh.orig 2022-07-02 17:22:18.108534561 +0200 ++++ dracut-057/modules.d/10i18n/module-setup.sh 2022-07-02 17:22:27.486491547 +0200 +@@ -63,7 +63,7 @@ + readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done) + + for INCL in "${INCLUDES[@]}"; do +- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do ++ for FN in "$dracutsysrootdir""${kbddir}"/keymaps/*/*/"$INCL"*; do + [[ -f $FN ]] || continue + [[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN" + done diff --git a/dracut.spec b/dracut.spec index 3ab0d6a..6c8bba7 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,6 +1,6 @@ Name: dracut Version: 057 -Release: 1mamba +Release: 2mamba Summary: Generic, modular initramfs generation tool that can be used across various distributions Group: System/Kernel and Hardware Vendor: openmamba @@ -26,6 +26,7 @@ Patch22: dracut-040-add_systemd_journald_socket.patch Patch23: dracut-044-bash-4.4.patch Patch24: dracut-049-squash-live-systemd-240.patch Patch25: dracut-055-bluetooth-lib64-fix.patch +Patch26: dracut-057-i18n-fix-adding-keymaps-includes.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -114,6 +115,7 @@ This package conatins extra optional modules for dracut. %ifarch x86_64 aarch64 %patch25 -p1 %endif +%patch26 -p1 #chmod +x modules.d/99squash-live/* @@ -428,6 +430,9 @@ fi #%doc NEWS README README.generic README.kernel README.modules TODO %changelog +* Sat Jul 02 2022 Silvan Calarco 057-2mamba +- added a patch to fix adding keymap includes causing systemd-vconsole startup error with host-only initramfs + * Wed Jun 22 2022 Automatic Build System 057-1mamba - automatic version update by autodist