From 16c166baaa943e68ac6ff2fb9afe982a295ef6ea Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 27 Sep 2015 18:25:17 +0300
Subject: [PATCH 1/2] linux: enable BLK_DEV_NVME

---
 projects/Generic/linux/linux.x86_64.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index e95f936342..9a2da0d53e 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.1.6 Kernel Configuration
+# Linux/x86_64 4.1.8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -1093,7 +1093,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_DRBD is not set
 CONFIG_BLK_DEV_NBD=y
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_BLK_DEV_NVME=y
 # CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM=y

From 397d26a9fc728a443b86a7ec85ead94d7d2dac2e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 27 Sep 2015 18:25:52 +0300
Subject: [PATCH 2/2] 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"
           ;;