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/a/kbd/setconsolefont | |
| 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/a/kbd/setconsolefont')
| -rw-r--r-- | source/a/kbd/setconsolefont | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/a/kbd/setconsolefont b/source/a/kbd/setconsolefont index c35f0c1de..b73192a11 100644 --- a/source/a/kbd/setconsolefont +++ b/source/a/kbd/setconsolefont @@ -6,11 +6,15 @@ # correctly in the installer. # 2010-04-28, add LatKaCyrHeb-14.psfu.gz <volkerdi> # 25-Mar-2018, generate font list on the fly <David Woodfall> +# 02-Oct-2023, don't run setfont if no font was previously loaded <volkerdi> if [ "$TMP" = "" ]; then TMP=/var/log/setup/tmp fi +# Has this script loaded a font? +FONT_LOADED=false + get_font_list() { LS_FONTS=$(/bin/ls $T_PX/usr/share/kbd/consolefonts/*.gz \ | rev | cut -f 1 -d / | rev | tail -n +10 | sed "s%$% ''%g" | tr '\n' ' ') @@ -29,12 +33,16 @@ load_font() { if [ ! $? = 0 ]; then if [ -r $T_PX/usr/share/kbd/consolefonts/$1 ]; then $CHROOT setfont $T_PX/usr/share/kbd/consolefonts/$* 1> /dev/null 2> /dev/null + FONT_LOADED=true elif [ -r $T_PX/usr/lib/kbd/consolefonts/$1 ]; then $CHROOT setfont $T_PX/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null + FONT_LOADED=true elif [ -r /var/adm/mount/live/usr/lib/kbd/consolefonts/$1 ]; then $CHROOT setfont /var/adm/mount/live/usr/lib/kbd/consolefonts/$* 1> /dev/null 2> /dev/null + FONT_LOADED=true else # load default font $CHROOT setfont + FONT_LOADED=true fi fi } @@ -67,7 +75,9 @@ out some custom screen fonts?" 5 60 like it, you can make it your new default screen font. You'll be able \ to try as many of these as you like.\" 21 65 12 -- $ALL_FONTS 2> $REPLY" if [ ! $? = 0 ]; then - load_font + if [ "$FONT_LOADED" = "true" ]; then + load_font + fi exit fi FONT=`cat $REPLY` |