From 11a96f70de3d2aab5ad1b6768eb03904eb8f98db Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Sat, 2 Jul 2011 19:11:15 +0200
Subject: [PATCH] vm: Load evtchn module by script in /etc/sysconfig/modules

---
 common/qubes_core           | 2 --
 common/qubes_core.modules   | 1 +
 rpm_spec/core-commonvm.spec | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 common/qubes_core.modules

diff --git a/common/qubes_core b/common/qubes_core
index ff3bf3c4..4225b489 100755
--- a/common/qubes_core
+++ b/common/qubes_core
@@ -15,8 +15,6 @@ start()
 		exit 1
 	fi
 
-	modprobe evtchn
-
 	# Set permissions to /proc/xen/xenbus, so normal user can use xenstore-read
 	chmod 666 /proc/xen/xenbus
 
diff --git a/common/qubes_core.modules b/common/qubes_core.modules
new file mode 100755
index 00000000..f5cb69cf
--- /dev/null
+++ b/common/qubes_core.modules
@@ -0,0 +1 @@
+modprobe xen-evtchn || modprobe evtchn
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index 26d89b11..624c470f 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -86,6 +86,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes
 cp qubes_trigger_sync_appmenus.sh $RPM_BUILD_ROOT/usr/lib/qubes/
 mkdir -p $RPM_BUILD_ROOT/var/lib/qubes/dom0-updates
 
+install -D qubes_core.modules $RPM_BUILD_ROOT/etc/sysconfig/modules/qubes_core.modules
+
 mkdir -p $RPM_BUILD_ROOT/lib/firmware
 ln -s /lib/modules/firmware $RPM_BUILD_ROOT/lib/firmware/updates
 
@@ -235,6 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/qubes_serial_login
 /usr/bin/xenstore-watch-qubes
 /etc/udev/rules.d/qubes_network.rules
+/etc/sysconfig/modules/qubes_core.modules
 /usr/lib/qubes/setup_ip
 /etc/yum/post-actions/qubes_trigger_sync_appmenus.action
 /usr/lib/qubes/qubes_trigger_sync_appmenus.sh