From b4ab187793a2a63c943134180b63c082f3664674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 14 Jun 2013 04:03:47 +0200
Subject: [PATCH] dracut: change the way to include ehci-pci module

Apparently add_drivers doesn't work. Looking at kernel-modules dracut
code, it can only be used for block-device driver and only makes sense
in --host-only mode.
So add additional module, which unconditionally install kernel modules.
---
 dracut/dracut.conf.d/extra-modules.conf          | 1 +
 dracut/dracut.conf.d/usb-drivers.conf            | 1 -
 dracut/modules.d/90extra-modules/module-setup.sh | 7 +++++++
 rpm_spec/core-dom0-linux.spec                    | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 dracut/dracut.conf.d/extra-modules.conf
 delete mode 100644 dracut/dracut.conf.d/usb-drivers.conf
 create mode 100755 dracut/modules.d/90extra-modules/module-setup.sh

diff --git a/dracut/dracut.conf.d/extra-modules.conf b/dracut/dracut.conf.d/extra-modules.conf
new file mode 100644
index 0000000..5c15f02
--- /dev/null
+++ b/dracut/dracut.conf.d/extra-modules.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" extra-modules "
diff --git a/dracut/dracut.conf.d/usb-drivers.conf b/dracut/dracut.conf.d/usb-drivers.conf
deleted file mode 100644
index 541e224..0000000
--- a/dracut/dracut.conf.d/usb-drivers.conf
+++ /dev/null
@@ -1 +0,0 @@
-add_drivers+=" ehci-pci "
diff --git a/dracut/modules.d/90extra-modules/module-setup.sh b/dracut/modules.d/90extra-modules/module-setup.sh
new file mode 100755
index 0000000..66f6c05
--- /dev/null
+++ b/dracut/modules.d/90extra-modules/module-setup.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Install some missing modules
+
+installkernel() {
+    # ehci-hcd split off
+    instmods ehci-pci ehci-platform || :
+}
diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec
index 2b04897..a1f6425 100644
--- a/rpm_spec/core-dom0-linux.spec
+++ b/rpm_spec/core-dom0-linux.spec
@@ -217,6 +217,8 @@ mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-script
 /etc/dracut.conf.d/*
 %dir %{_dracutmoddir}/90qubes-pciback
 %{_dracutmoddir}/90qubes-pciback/*
+%dir %{_dracutmoddir}/90extra-modules
+%{_dracutmoddir}/90extra-modules/*
 # Qrexec
 %attr(4750,root,qubes) /usr/lib/qubes/qrexec-daemon
 /usr/lib/qubes/qrexec-client