From 4eb488d6f955a0130cc4db4ec8a60e849f117447 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 16 Aug 2023 20:45:00 +0000
Subject: Wed Aug 16 20:45:00 UTC 2023

a/kernel-firmware-20230814_0e048b0-noarch-1.txz:  Upgraded.
a/kernel-generic-6.1.46-x86_64-1.txz:  Upgraded.
a/kernel-huge-6.1.46-x86_64-1.txz:  Upgraded.
a/kernel-modules-6.1.46-x86_64-1.txz:  Upgraded.
ap/inxi-3.3.29_1-noarch-1.txz:  Upgraded.
d/kernel-headers-6.1.46-x86-1.txz:  Upgraded.
k/kernel-source-6.1.46-noarch-1.txz:  Upgraded.
  -ACPI_TINY_POWER_BUTTON n
   ACPI_AC m -> y
   ACPI_BATTERY m -> y
   ACPI_BUTTON m -> y
   ACPI_FAN m -> y
   ACPI_THERMAL m -> y
kde/kirigami-addons-0.11.0-x86_64-1.txz:  Upgraded.
n/bind-9.18.18-x86_64-1.txz:  Upgraded.
n/httpd-2.4.57-x86_64-2.txz:  Rebuilt.
  rc.httpd: wait using pwait after stopping, fix usage to show force-restart.
  Thanks to metaed.
n/net-snmp-5.9.4-x86_64-1.txz:  Upgraded.
n/openvpn-2.6.6-x86_64-1.txz:  Upgraded.
n/php-8.2.9-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues:
  Security issue with external entity loading in XML without enabling it.
  Buffer mismanagement in phar_dir_read().
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-3823
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-3824
  (* Security fix *)
x/xorg-server-xwayland-23.2.0-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-115.1.1-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/115.1.1/releasenotes/
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/sources/initrd/etc/rc.d/rc.S | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'source/installer/sources/initrd/etc/rc.d')

diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S
index 133a7bf3b..ce8c32d5c 100755
--- a/source/installer/sources/initrd/etc/rc.d/rc.S
+++ b/source/installer/sources/initrd/etc/rc.d/rc.S
@@ -182,8 +182,14 @@ rm -f /tmp/foo
 echo "Activating LVM volumes:"
 vgchange -ay
 
-if [ -x /etc/rc.d/rc.font ]; then
-  /bin/sh /etc/rc.d/rc.font
+# In testing here the results of running rc.font with HiDPI screens has been
+# rather unpredicable, sometimes resulting in an unreadably small font rather
+# than increasing the size. Let's skip it unless RCFONT is passed as a kernel
+# command-line flag:
+if cat /proc/cmdline | grep -wq RCFONT ; then
+  if [ -x /etc/rc.d/rc.font ]; then
+    /bin/sh /etc/rc.d/rc.font
+  fi
 fi
 
 # Don't automatically blank the screen, or it will go black during the install
-- 
cgit v1.2.3-65-gdbad