diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-11-08 22:04:25 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-11-08 23:36:11 +0100 |
| commit | d387e58ecc1078f05ee9e618aef86b008b52ed89 (patch) | |
| tree | 78360deed7291fc2e51e379795a2b9d0d95d27d9 /source/installer/sources/initrd/etc/rc.d/rc.S | |
| parent | 69753b9a1da83d78dab7943e3fcdb428ee74a254 (diff) | |
| download | current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.gz current-d387e58ecc1078f05ee9e618aef86b008b52ed89.tar.xz | |
Wed Nov 8 22:04:25 UTC 202320231108220425
a/kbd-2.6.3-x86_64-1.txz: Upgraded.
Thanks to Robby Workman.
a/kernel-firmware-20231107_2340796-noarch-1.txz: Upgraded.
a/kernel-generic-6.1.62-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.62-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.62-x86_64-1.txz: Upgraded.
ap/sudo-1.9.15p1-x86_64-1.txz: Upgraded.
This is a bugfix release:
Fixed a bug introduced in sudo 1.9.15 that prevented LDAP-based sudoers
from being able to read the ldap.conf file.
d/kernel-headers-6.1.62-x86-1.txz: Upgraded.
k/kernel-source-6.1.62-noarch-1.txz: Upgraded.
kde/plasma-wayland-protocols-1.11.0-x86_64-1.txz: Upgraded.
l/liburing-2.5-x86_64-1.txz: Upgraded.
xap/mozilla-thunderbird-115.4.2-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/thunderbird/115.4.2/releasenotes/
xap/xlockmore-5.74-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/installer/sources/initrd/etc/rc.d/rc.S')
| -rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index ce8c32d5c..dec350d0a 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -250,11 +250,23 @@ if ! cat /proc/cmdline | grep -q 'kbd=' 2> /dev/null ; then else for ARG in `cat /proc/cmdline` ; do if [ "`echo $ARG | cut -f1 -d=`" = "kbd" ]; then - BMAP="`echo $ARG | cut -f2 -d=`.bmap" + # A keymap was specified on the kernel command line such as: kbd=azerty + MAPSELECT="$(echo $ARG | cut -f2 -d=)" + # If it ends in .gz, strip that off: + if [ "$(echo $MAPSELECT | rev | cut -f 1 -d . | rev)" = "gz" ]; then + MAPSELECT=$(basename $MAPSELECT .gz) + fi + # If it doesn't end in .map, add that: + if [ ! "$(echo $MAPSELECT | rev | cut -f 1 -d . | rev)" = "map" ]; then + MAPSELECT=${MAPSELECT}.map + fi + # Load the keymap: + loadkeys -q $MAPSELECT + # Let the setup script know about this: + echo $MAPSELECT > /tmp/Pkeymap + unset MAPSELECT fi done - tar xzOf /etc/keymaps.tar.gz $BMAP | loadkmap - unset BMAP fi clear |