From 98175558d7a0dcd6e001ae887a44c05cf7955d63 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 26 Sep 2022 19:43:54 +0000
Subject: Mon Sep 26 19:43:54 UTC 2022

a/bash-5.2.000-x86_64-1.txz:  Upgraded.
ap/vim-9.0.0594-x86_64-1.txz:  Upgraded.
  Fixed stack-based buffer overflow.
  Thanks to marav for the heads-up.
  In addition, Mig21 pointed out an issue where the defaults.vim file might
  need to be edited for some purposes as its contents will override the
  settings in the system-wide vimrc. Usually this file is replaced whenever
  vim is upgraded, which in those situations would be inconvenient for the
  admin. So, I've added support for a file named defaults.vim.custom which
  (if it exists) will be used instead of the defaults.vim file shipped in
  the package and will persist through upgrades.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3296
  (* Security fix *)
l/fluidsynth-2.3.0-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_49-x86_64-1.txz:  Upgraded.
l/libcap-2.66-x86_64-1.txz:  Upgraded.
l/netpbm-10.99.03-x86_64-1.txz:  Upgraded.
l/readline-8.2.000-x86_64-1.txz:  Upgraded.
l/xapian-core-1.4.21-x86_64-1.txz:  Upgraded.
n/dnsmasq-2.87-x86_64-1.txz:  Upgraded.
  Fix write-after-free error in DHCPv6 server code.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0934
  (* Security fix *)
x/xterm-373-x86_64-1.txz:  Upgraded.
xap/vim-gvim-9.0.0594-x86_64-1.txz:  Upgraded.
---
 source/installer/sources/initrd/sbin/probe | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'source/installer/sources')

diff --git a/source/installer/sources/initrd/sbin/probe b/source/installer/sources/initrd/sbin/probe
index 5ab7602fc..2ba2e0f2a 100755
--- a/source/installer/sources/initrd/sbin/probe
+++ b/source/installer/sources/initrd/sbin/probe
@@ -155,9 +155,10 @@ list_mmc() {
   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* | grep -E 'disk$' | awk '{print $1}' | while read device ; do
-    fdisk -l $device >> $TMP/SeTfdisk
-  done
+  grep -qE 'mmcblk[0-9]' /proc/partitions && {
+    lsblk -o name,type -ripnd /dev/mmcblk* | grep -E 'disk$' | awk '{print $1}' | while read device ; do
+      fdisk -l $device >> $TMP/SeTfdisk
+    done ;}
 }
 
 list_nvme() {
@@ -324,6 +325,9 @@ list_lvm
 # List CRYPT volumes:
 list_crypt
 
+# List MMC (e.g. SD cards) partitions:
+list_mmc
+
 ## This is obsolete, since fdisk handles GPT now.
 ## List GPT partitions:
 #cat /proc/partitions | while read line ; do
@@ -412,8 +416,6 @@ if cat /proc/partitions | grep -E '/|[0-9]' 1>/dev/null 2>/dev/null ; then # new
       list_cciss $(( $MAJOR - 104 )) $MINOR
     elif [ "$MAJOR" = "114" ]; then
       list_ataraid $MAJOR $MINOR
-    elif [ "$MAJOR" = "179" ]; then
-      list_mmc $MAJOR $MINOR
     elif [ "$MAJOR" = "259" ]; then
       if echo $line | grep -q p; then
         list_nvme $DEVNAME
-- 
cgit v1.2.3