diff options
Diffstat (limited to 'scripts/install/install-functions')
| -rwxr-xr-x | scripts/install/install-functions | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions index a038686c..c9f3642e 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -151,7 +151,7 @@ get_drive_size () { # Probe hardrives not shown in /proc/partitions by default probe_drives () { # Find drives that may not be in /proc/partitions since not mounted - drive=$(ls /sys/block | grep '[hsv]d.') + drive=$(ls /sys/block | grep '[hsv]d.|nvme.') # now exclude all drives that are read-only for drive in $drive; do @@ -174,13 +174,13 @@ select_drive () { local drv='' # list the drives in /proc/partitions. Remove partitions and empty lines. # the first grep pattern looks for devices named c0d0, hda, and sda. - #drives=$(cat /proc/partitions | \ - # awk '{ if ($4!="name") { print $4 } }' | \ - # egrep "c[0-9]d[0-9]$|[hsv]d[a-z]$" | \ - # egrep -v "^$") + drives=$(cat /proc/partitions | \ + awk '{ if ($4!="name") { print $4 } }' | \ + egrep "c[0-9]d[0-9]$|[hsv]d[a-z]$|nvme[0-9]n[0-9]" | \ + egrep -v "^$") - #should be better about finding installable drives - drives=$(lsblk -dn -o name -I8) + #this needs more testing to decide if better than above + #drives=$(lsblk -dn -o name -I8) # take the first drive as the default drv=$(echo $drives | /usr/bin/awk '{ print $1 }') |