From 6f94650805f71ecfbe4186875f9bf5df38cdaccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 21 Mar 2014 15:34:46 +0100
Subject: [PATCH] lorax, comps: disable multipath

It isn't normally needed on desktop systems, but causes dependency
loop inside initrd.
---
 conf/comps-qubes.xml                                     | 2 --
 lorax-templates-qubes/templates/runtime-postinstall.tmpl | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/conf/comps-qubes.xml b/conf/comps-qubes.xml
index 79e5b8e..2bcf225 100644
--- a/conf/comps-qubes.xml
+++ b/conf/comps-qubes.xml
@@ -204,7 +204,6 @@
       <packagereq type="mandatory">bzip2</packagereq>
       <packagereq type="mandatory">cronie</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
-      <packagereq type="mandatory">device-mapper-multipath</packagereq>
       <packagereq type="mandatory">diffutils</packagereq>
       <packagereq type="mandatory">dmraid</packagereq>
       <packagereq type="mandatory">dump</packagereq>
@@ -971,7 +970,6 @@
       <packagereq>btrfs-progs</packagereq>
       <packagereq>chkconfig</packagereq>
       <packagereq>cryptsetup</packagereq>
-      <packagereq>device-mapper-multipath</packagereq>
       <packagereq>dmraid</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>dracut-network</packagereq>
diff --git a/lorax-templates-qubes/templates/runtime-postinstall.tmpl b/lorax-templates-qubes/templates/runtime-postinstall.tmpl
index dc23af9..d212446 100644
--- a/lorax-templates-qubes/templates/runtime-postinstall.tmpl
+++ b/lorax-templates-qubes/templates/runtime-postinstall.tmpl
@@ -103,6 +103,7 @@ symlink ../run/install mnt/install
 append etc/depmod.d/dd.conf "search updates built-in"
 
 ## include additional modules in initramfs
-append etc/dracut.conf.d/extra-install-modules.conf "add_drivers+=' ehci-pci'"
+append etc/dracut.conf.d/extra-install-modules.conf "add_drivers+=' ehci-pci '"
+append etc/dracut.conf.d/extra-install-modules.conf "omit_dracutmodules+=' multipath '"
 
 ## TODO: we could run prelink here if we wanted?