Explorar el Código

Use systemd mechanism for loading kernel modules (when available)

One more thing done in more generic way (not Fedora-specific).
Marek Marczykowski-Górecki hace 9 años
padre
commit
4bccdb0ba5

+ 4 - 2
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

+ 0 - 0
misc/qubes-core.modules → vm-init.d/qubes-core.modules


+ 0 - 0
misc/qubes-misc.modules → vm-init.d/qubes-misc.modules


+ 3 - 0
vm-systemd/qubes-core.conf

@@ -0,0 +1,3 @@
+xen-evtchn
+xen-blkback
+xen-usbfront

+ 1 - 0
vm-systemd/qubes-misc.conf

@@ -0,0 +1 @@
+dummy-hcd