Tue Jan 18 20:39:39 UTC 202220220118203939

l/rpcsvc-proto-1.4.3-x86_64-1.txz:  Upgraded.
x/xterm-370-x86_64-5.txz:  Rebuilt.
  XTerm-console: don't include locale options by default. Fix typo in comment.
  Thanks to GazL.
isolinux/initrd.img:  Rebuilt.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

6 files changed, 26 insertions, 12 deletions

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index d2e7a8730..5282ea364 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tue Jan 18 11:42:59 UTC 2022
+  /usr/lib/setup/setup: If a Slackware USB stick was used as the package
+  source, prompt user to unplug the USB stick when the installation
+  completes.
+  /usr/lib/setup/INSUSB: Fix a cosmetic bug if the USB stick has no partitions.
+  MoZes.
++--------------------------+
 Sun Jan 16 20:51:35 UTC 2022
   Fix installation of the exfat kernel module(s).
   Thanks to Nille_kungen.
diff --git a/source/installer/sources/initrd/usr/lib/setup/INSUSB b/source/installer/sources/initrd/usr/lib/setup/INSUSB
index 04723159c..3b04c1f4f 100755
--- a/source/installer/sources/initrd/usr/lib/setup/INSUSB
+++ b/source/installer/sources/initrd/usr/lib/setup/INSUSB
@@ -77,7 +77,7 @@ if [ "$DRIVE_FOUND" = "" ]; then
       break
     fi
     if [ -d /usb-stick/slackware*-*/slackware/a ]; then
-      DRIVE_FOUND="/dev/$DEVICE$PARTITION"
+      DRIVE_FOUND="/dev/$DEVICE"
       INSTALL_PATH=$(echo /usb-stick/slackware*-*/slackware)
       break
     fi
diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup
index c8c2aeabd..5fc8a0e4b 100755
--- a/source/installer/sources/initrd/usr/lib/setup/setup
+++ b/source/installer/sources/initrd/usr/lib/setup/setup
@@ -2,7 +2,7 @@
 #
 # Copyright 1993, 1994, 1999  Patrick Volkerding, Moorhead, Minnesota USA
 # Copyright 2001, 2003, 2004  Slackware Linux, Inc., Concord, CA
-# Copyright 2006, 2007, 2018, 2021 Patrick Volkerding, Sebeka, Minnesota USA
+# Copyright 2006, 2007, 2018, 2021, 2022 Patrick Volkerding, Sebeka, Minnesota USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is 
@@ -422,6 +422,20 @@ if [ -f ${T_PX}/etc/fstab ]; then
      --msgbox "\nPlease remove the installation disc.\n" 7 40
   fi
 
+  # Prompt the user to unplug the USB stick containing the Slackware
+  # media:
+  mountpoint -q /usb-stick && {
+    # Try to umount the USB stick, but ignore any errors (errors would typically be
+    # occur if the user has a shell open within the USB stick's mount point), since
+    # we'll be shutting down soon anyway.
+    sync
+    umount /usb-stick > /dev/null 2>&1
+    dialog \
+      --title "Unplug Slackware Installation Media USB Stick" \
+      --msgbox \
+        "\nYou may now physically unplug the Slackware Installation Media USB stick from the USB port.\n" 8 60
+  }
+
   # Offer to reboot or drop to shell or power off.
   exec 3>&1
   installerexittype=$( dialog \
diff --git a/source/l/rpcsvc-proto/rpcsvc-proto.SlackBuild b/source/l/rpcsvc-proto/rpcsvc-proto.SlackBuild
index b003e5594..2d2c27b45 100755
--- a/source/l/rpcsvc-proto/rpcsvc-proto.SlackBuild
+++ b/source/l/rpcsvc-proto/rpcsvc-proto.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rpcsvc-proto
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/x/xterm/XTerm-console b/source/x/xterm/XTerm-console
index 7dbe6d55b..3dfe77151 100644
--- a/source/x/xterm/XTerm-console
+++ b/source/x/xterm/XTerm-console
@@ -18,7 +18,7 @@
 ! Bitmap fonts:
 !   note: Some folks may find these a little large, but 'hidpi' display
 !   users will appreciate the larger sizes, and the other sizes in the
-!   the terminus series don't maintain a consistent aspect ration and 
+!   the terminus series don't maintain a consistent aspect ratio and 
 !   can look a little odd when being resized.
 
 *VT100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
@@ -92,11 +92,4 @@
 *VT100.charClass: 45-47:48,58:48,64:48
 !   - Set which characters are selected by double click.
 
-!*VT100.locale: true
-!   - Seems better to use the XTerm.locale below, as this throws an
-!     error if LC_ALL is unset.
-
-*XTerm.locale: true
-!   - Enable conversion between the locale and utf-8.
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! End. !
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 0b1aa21fd..528289879 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xterm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}