Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport upstream fixes to 059 #310

Merged
merged 5 commits into from
Feb 9, 2024
Merged

Backport upstream fixes to 059 #310

merged 5 commits into from
Feb 9, 2024

Commits on Feb 9, 2024

  1. fix(i18n): handle symlinked keymap 

    handle keymaps that are symlinks to others, for example:

KEYMAP=de-nodeadkeys in vconsole.conf is:

lrwxrwxrwx 1 root root 20 17. Mai 2023  /usr/share/kbd/keymaps/xkb/de-nodeadkeys.map.gz -> at-nodeadkeys.map.gz
    @tblume @aafeijoo-suse
    tblume authored and aafeijoo-suse committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6051833 View commit details
    Browse the repository at this point in the history

  2. fix(dracut-systemd): replace rd.udev.log-priority with `rd.udev.log… 

    …_level`

`rd.udev.log-priority` is deprecated since systemd-v247
(systemd/systemd@64a3494c)

Also, fix deprecation warning not being displayed for `rdudevinfo` and
`rdudevdebug`.
    @aafeijoo-suse
    aafeijoo-suse committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    d801c7d View commit details
    Browse the repository at this point in the history

  3. fix(i18n): handle keymap includes with --sysroot 

    The results of `find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0`
are directly passed to `findkeymap` containing the `$dracutsysrootdir` path,
which causes that `[[ -f $dracutsysrootdir$1 ]]` evaluates to false because the
same path is prepended again, and the following `find` fails because `MAPNAME`
has an absolute path.

E.g., with `dracutsysrootdir=/.snapshots/9/snapshot`, for `MAPNAME=us` the
`INCLUDES` of `MAP=/.snapshots/9/snapshot/usr/share/kbd/keymaps/i386/qwerty/us.map.gz`
will pass `/.snapshots/9/snapshot/usr/share/kbd/keymaps/i386/include/qwerty-layout.inc` to
`findkeymap`.

```
dracut[I]: *** Including module: i18n ***
find: warning: ‘-name’ matches against basenames only, but the given pattern contains a directory separator (‘/’), thus the expression will evaluate to false all the time.  Did you mean ‘-wholename’?
```
    @aafeijoo-suse
    aafeijoo-suse committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3cbf46e View commit details
    Browse the repository at this point in the history

  4. fix(dracut-init.sh): handle decompress with --sysroot 

    Remove `$dracutsysrootdir` from the file path passed to the decompress command,
otherwise the path is wrong and the file is not decompressed in the temporary
directory where the initramfs is being built.

E.g.:

```
dracut[I]: *** Including module: i18n ***
gzip: /var/tmp/dracut.6Iqygd/initramfs/.snapshots/12/snapshot/usr/share/kbd/keymaps/i386/include/euro1.map.gz: No such file or directory
gzip: /var/tmp/dracut.6Iqygd/initramfs/.snapshots/12/snapshot/usr/share/kbd/keymaps/i386/qwerty/us.map.gz: No such file or directory
gzip: /var/tmp/dracut.6Iqygd/initramfs/.snapshots/12/snapshot/usr/share/kbd/keymaps/xkb/us.map.gz: No such file or directory
```
    @aafeijoo-suse
    aafeijoo-suse committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    3a46a52 View commit details
    Browse the repository at this point in the history

  5. chore(suse): update SUSE maintainers doc

    @aafeijoo-suse
    aafeijoo-suse committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    8f9338a View commit details
    Browse the repository at this point in the history