From 397d26a9fc728a443b86a7ec85ead94d7d2dac2e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 27 Sep 2015 18:25:52 +0300 Subject: [PATCH] installer: add support for /dev/nvme --- packages/tools/installer/scripts/installer | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 4cbca24d8d..0ddf8c6475 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -70,7 +70,7 @@ get_device_unmount() { # provides: DEVICES DEVICES="" - DEVICES=$(parted -s -m -l | grep -E '^/dev/sd|^/dev/mmcblk' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":") + DEVICES=$(parted -s -m -l | grep -E '^/dev/sd|^/dev/mmcblk|^/dev/nvme' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":") for i in $(cat /proc/mounts | grep -E '^/dev/sd' | cut -f1 -d " " | sed "s/[0-9].*$//"); do DEVICES=$(echo $DEVICES |sed -e "s|$i||") @@ -79,6 +79,10 @@ get_device_unmount() { for i in $(cat /proc/mounts | grep -E '^/dev/mmcblk' | cut -f1 -d " " | sed "s/p.*$//"); do DEVICES=$(echo $DEVICES |sed -e "s|$i||") done + + for i in $(cat /proc/mounts | grep -E '^/dev/nvme' | cut -f1 -d " " | sed "s/p.*$//"); do + DEVICES=$(echo $DEVICES |sed -e "s|$i||") + done } get_partition() { @@ -195,7 +199,7 @@ do_install_quick() { INSTALL_DEVICE_FULL=$(echo $DEVICE_LIST | sed "s|.*$INSTALL_DEVICE \([^ ]*\).*|$INSTALL_DEVICE \1|") case $INSTALL_DEVICE in - "/dev/mmcblk"*) + "/dev/mmcblk"*|"/dev/nvme"*) PART1="p1" PART2="p2" ;;