jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4343 from stefansaraev/nvme

Browse Source 
add nvme block device support to kernel/installer
This commit is contained in:
Peter Frühberger 2015-09-27 19:01:26 +02:00
commit 4aea0bf278
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/tools/installer/scripts/installer
View File

@ -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"
;;

4
projects/Generic/linux/linux.x86_64.conf
View File

@ -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