summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/install/install-functions4
-rwxr-xr-xscripts/install/install-get-partition2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index d241e040..d65a6c6c 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
@@ -176,7 +176,7 @@ select_drive () {
# 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 "c[0-9]d[0-9]$|[hsv]d[a-z]$|nvme[0-9]n[0-9]" | \
egrep -v "^$")
# take the first drive as the default
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index d6bb5524..e44fcec1 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -699,7 +699,7 @@ create_partitions() {
fi
# set the partition number on the device.
- if [ -n "$( echo $ldrive | grep -E "cciss|ida" )" ]; then
+ if [ -n "$( echo $ldrive | grep -E "cciss|ida|nvme" )" ]; then
# if this is a cciss
ROOT_PARTITION=$ldrive"p1"
else