From 82923bb8a068cf06610a8a518940d92733d0bed9 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Mon, 17 Jul 2017 10:50:45 +0800 Subject: [PATCH] initrd: support NVMe SSD device nodes Extend the pattern to cover /dev/nvme*. --- initrd/init | 4 ++-- install/scripts/1-install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/initrd/init b/initrd/init index 32d6a4e..6a30441 100755 --- a/initrd/init +++ b/initrd/init @@ -3,7 +3,7 @@ # By Chih-Wei Huang # and Thorsten Glaser # -# Last updated 2017/04/23 +# Last updated 2017/07/17 # # License: GNU Public License # We explicitely grant the right to use the scripts @@ -149,7 +149,7 @@ done mount -t tmpfs tmpfs /android cd /android while :; do - for device in ${ROOT:-/dev/[hmsv][dmr][0-9a-z]*}; do + for device in ${ROOT:-/dev/[hmnsv][dmrv][0-9a-z]*}; do check_root $device && break 2 mountpoint -q /mnt && umount /mnt done diff --git a/install/scripts/1-install b/install/scripts/1-install index 3aa70f2..fd01289 100644 --- a/install/scripts/1-install +++ b/install/scripts/1-install @@ -394,7 +394,7 @@ install_hd() select_dev || rebooting retval=1 case "$choice" in - [shvm][dm]*) + [hmnsv][dmv]*) install_to $choice retval=$? ;; -- 2.11.0