From 4bccdb0ba53ba80e02a48f81c33c58791ebf8534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 29 Sep 2014 21:31:10 +0200
Subject: [PATCH] Use systemd mechanism for loading kernel modules (when
 available)

One more thing done in more generic way (not Fedora-specific).
---
 rpm_spec/core-vm.spec                  | 6 ++++--
 {misc => vm-init.d}/qubes-core.modules | 0
 {misc => vm-init.d}/qubes-misc.modules | 0
 vm-systemd/qubes-core.conf             | 3 +++
 vm-systemd/qubes-misc.conf             | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)
 rename {misc => vm-init.d}/qubes-core.modules (100%)
 rename {misc => vm-init.d}/qubes-misc.modules (100%)
 create mode 100644 vm-systemd/qubes-core.conf
 create mode 100644 vm-systemd/qubes-misc.conf

diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 0bf9ee7..131eed0 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -323,8 +323,6 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/sudoers.d/qubes
 %config(noreplace) /etc/sysconfig/iptables
 %config(noreplace) /etc/sysconfig/ip6tables
-/etc/sysconfig/modules/qubes-core.modules
-/etc/sysconfig/modules/qubes-misc.modules
 %config(noreplace) /etc/tinyproxy/filter-updates
 %config(noreplace) /etc/tinyproxy/tinyproxy-updates.conf
 %config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules
@@ -409,6 +407,8 @@ The Qubes core startup configuration for SysV init (or upstart).
 /etc/init.d/qubes-netwatcher
 /etc/init.d/qubes-updates-proxy
 /etc/init.d/qubes-qrexec-agent
+/etc/sysconfig/modules/qubes-core.modules
+/etc/sysconfig/modules/qubes-misc.modules
 
 %post sysvinit
 
@@ -489,6 +489,8 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/qubes-update-check.timer
 /lib/systemd/system/qubes-updates-proxy.service
 /lib/systemd/system/qubes-qrexec-agent.service
+/lib/modules-load.d/qubes-core.conf
+/lib/modules-load.d/qubes-misc.conf
 %dir /usr/lib/qubes/init
 /usr/lib/qubes/init/prepare-dvm.sh
 /usr/lib/qubes/init/network-proxy-setup.sh
diff --git a/misc/qubes-core.modules b/vm-init.d/qubes-core.modules
similarity index 100%
rename from misc/qubes-core.modules
rename to vm-init.d/qubes-core.modules
diff --git a/misc/qubes-misc.modules b/vm-init.d/qubes-misc.modules
similarity index 100%
rename from misc/qubes-misc.modules
rename to vm-init.d/qubes-misc.modules
diff --git a/vm-systemd/qubes-core.conf b/vm-systemd/qubes-core.conf
new file mode 100644
index 0000000..236bd8c
--- /dev/null
+++ b/vm-systemd/qubes-core.conf
@@ -0,0 +1,3 @@
+xen-evtchn
+xen-blkback
+xen-usbfront
diff --git a/vm-systemd/qubes-misc.conf b/vm-systemd/qubes-misc.conf
new file mode 100644
index 0000000..e799241
--- /dev/null
+++ b/vm-systemd/qubes-misc.conf
@@ -0,0 +1 @@
+dummy-hcd