From cc80d98a04c3f17383d8366e63badc444ea381d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
Date: Fri, 13 Oct 2017 09:04:31 +0200
Subject: [PATCH] Keep NVMe drivers in the initrd

Support systems with the root filesystem on a NVMe device
---
 kiwi/boot/arch/x86_64/oemboot/suse-SLES12/config.xml     | 2 ++
 kiwi/boot/arch/x86_64/oemboot/suse-SLES15/config.xml     | 2 ++
 kiwi/boot/arch/x86_64/oemboot/suse-leap42.2/config.xml   | 2 ++
 kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml   | 2 ++
 kiwi/boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-SLES12/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-SLES12/config.xml
index c7c9e188..e6f72cc5 100644
--- a/kiwi/boot/arch/x86_64/oemboot/suse-SLES12/config.xml
+++ b/kiwi/boot/arch/x86_64/oemboot/suse-SLES12/config.xml
@@ -45,6 +45,8 @@
         <file name="drivers/md/*"/>
         <file name="drivers/message/fusion/*"/>
         <file name="drivers/net/*"/>
+        <file name="drivers/nvme/*"/>
+        <file name="drivers/nvmem/*"/>
         <file name="drivers/parport/*"/>
         <file name="drivers/scsi/*"/>
         <file name="drivers/staging/hv/*"/>
diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-SLES15/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-SLES15/config.xml
index 450a6511..ab840c31 100644
--- a/kiwi/boot/arch/x86_64/oemboot/suse-SLES15/config.xml
+++ b/kiwi/boot/arch/x86_64/oemboot/suse-SLES15/config.xml
@@ -43,6 +43,8 @@
         <file name="drivers/md/*"/>
         <file name="drivers/message/fusion/*"/>
         <file name="drivers/net/*"/>
+        <file name="drivers/nvme/*"/>
+        <file name="drivers/nvmem/*"/>
         <file name="drivers/parport/*"/>
         <file name="drivers/scsi/*"/>
         <file name="drivers/staging/hv/*"/>
diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.2/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.2/config.xml
index 71ef0d76..957e65ac 100644
--- a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.2/config.xml
+++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.2/config.xml
@@ -46,6 +46,8 @@
         <file name="drivers/md/*"/>
         <file name="drivers/message/fusion/*"/>
         <file name="drivers/net/*"/>
+        <file name="drivers/nvme/*"/>
+        <file name="drivers/nvmem/*"/>
         <file name="drivers/parport/*"/>
         <file name="drivers/scsi/*"/>
         <file name="drivers/staging/hv/*"/>
diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml
index 4abe30a4..c1911dce 100644
--- a/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml
+++ b/kiwi/boot/arch/x86_64/oemboot/suse-leap42.3/config.xml
@@ -43,6 +43,8 @@
         <file name="drivers/md/*"/>
         <file name="drivers/message/fusion/*"/>
         <file name="drivers/net/*"/>
+        <file name="drivers/nvme/*"/>
+        <file name="drivers/nvmem/*"/>
         <file name="drivers/parport/*"/>
         <file name="drivers/scsi/*"/>
         <file name="drivers/staging/hv/*"/>
diff --git a/kiwi/boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml b/kiwi/boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
index 1097ae34..48e223c1 100644
--- a/kiwi/boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
+++ b/kiwi/boot/arch/x86_64/oemboot/suse-tumbleweed/config.xml
@@ -46,6 +46,8 @@
         <file name="drivers/md/*"/>
         <file name="drivers/message/fusion/*"/>
         <file name="drivers/net/*"/>
+        <file name="drivers/nvme/*"/>
+        <file name="drivers/nvmem/*"/>
         <file name="drivers/parport/*"/>
         <file name="drivers/scsi/*"/>
         <file name="drivers/staging/hv/*"/>