Thu Dec 16 21:34:10 UTC 202120211216213410

a/kernel-firmware-20211216_f682ecb-noarch-1.txz:  Upgraded.
a/kernel-generic-5.15.9-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.15.9-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.15.9-x86_64-1.txz:  Upgraded.
a/openssl-solibs-1.1.1m-x86_64-1.txz:  Upgraded.
ap/inxi-3.3.10_1-noarch-1.txz:  Upgraded.
  Thanks to h2-1.
d/kernel-headers-5.15.9-x86-1.txz:  Upgraded.
d/vala-0.54.5-x86_64-1.txz:  Upgraded.
k/kernel-source-5.15.9-noarch-1.txz:  Upgraded.
   SUNRPC_DEBUG n -> y
  +NFS_DEBUG y
  Thanks to bassmadrigal.
kde/latte-dock-0.10.5-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.73.1-x86_64-1.txz:  Upgraded.
l/pipewire-0.3.42-x86_64-1.txz:  Upgraded.
n/iputils-20211215-x86_64-1.txz:  Upgraded.
n/openssl-1.1.1m-x86_64-1.txz:  Upgraded.
n/php-7.4.27-x86_64-1.txz:  Upgraded.
x/xorg-server-1.20.14-x86_64-1.txz:  Upgraded.
  Built using --enable-systemd-logind to use elogind for device setup.
  Some code changes would be required in xorg-server, xinit, and various login
  managers to make rootless X work out of the box or to fall back in cases
  where elogind isn't supported, and those changes aren't appropriate here in
  the RC stage, but you can try it without recompiling:
  chmod 755 /usr/libexec/Xorg*
  Thanks to LuckyCyborg.
x/xorg-server-xephyr-1.20.14-x86_64-1.txz:  Upgraded.
x/xorg-server-xnest-1.20.14-x86_64-1.txz:  Upgraded.
x/xorg-server-xvfb-1.20.14-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-91.4.1esr-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/91.4.1/releasenotes/
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

2 files changed, 22 insertions, 10 deletions

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 3c4e5c92d..6710d1413 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Wed Dec 15 04:07:42 UTC 2021
+  /sbin/probe:  Discover MMC storage devices using lsblk.
+  Thanks to Stuart Winter.
++--------------------------+
 Sun Nov  7 06:11:40 UTC 2021
   usr/lib/setup/setup:  Added 'power off' to the list of available options
   ('reboot' and 'shell'), when the installer completes successfully.
diff --git a/source/installer/sources/initrd/sbin/probe b/source/installer/sources/initrd/sbin/probe
index f7ab07ab8..3b481432f 100755
--- a/source/installer/sources/initrd/sbin/probe
+++ b/source/installer/sources/initrd/sbin/probe
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This is 'probe', a wrapper for using fdisk to gather drive info for
 # the Slackware setup scripts.  I hate to bounce this much garbage through
 # a tmpdir, but it looks like large variables can make ash crash...
@@ -140,16 +140,24 @@ list_amiraid() {
   fi
 }
 
+#list_mmc() {
+#  # find drive
+#  DRV=`expr $2 / 8`
+#  NUM=`expr $2 % 8`
+#  if [ "$NUM" = "0" ]; then
+#     fdisk -l /dev/mmcblk$DRV >> $TMP/SeTfdisk
+#     #output_gpt_partitions /dev/mmcblk$DRV >> $TMP/SeTfdisk
+#  else
+#     return
+#  fi
+#}
 list_mmc() {
-  # find drive
-  DRV=`expr $2 / 8`
-  NUM=`expr $2 % 8`
-  if [ "$NUM" = "0" ]; then
-     fdisk -l /dev/mmcblk$DRV >> $TMP/SeTfdisk
-     #output_gpt_partitions /dev/mmcblk$DRV >> $TMP/SeTfdisk
-  else
-     return
-  fi
+  local device
+  # Filter out any partitions on the block device, as we'll use
+  # fdisk to capture those:
+  lsblk -o name,type -ripnd /dev/mmcblk* | egrep 'disk$' | awk '{print $1}' | while read device ; do
+    fdisk -l $device >> $TMP/SeTfdisk
+  done
 }
 
 list_nvme() {