diff options
Diffstat (limited to 'source/installer')
| -rw-r--r-- | source/installer/ChangeLog.txt | 4 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/sbin/probe | 28 |
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() { |