Browse Source

Do not load 'dummy-hcd' kernel module

It isn't really needed. It was used to workaround libusb bug (causing
crash when the system does not have any USB controller), but since we
use HVM now which do have some USB controllers it isn't needed anymore.

Also, it is not available in stock Fedora kernels.
Marek Marczykowski-Górecki 6 years ago
parent
commit
68d98179f0

+ 0 - 2
Makefile

@@ -122,7 +122,6 @@ install-systemd: install-init
 	install -m 0644 vm-systemd/qubes-*.socket $(DESTDIR)$(SYSLIBDIR)/systemd/system/
 	install -m 0644 vm-systemd/75-qubes-vm.preset $(DESTDIR)$(SYSLIBDIR)/systemd/system-preset/
 	install -m 0644 vm-systemd/qubes-core.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
-	install -m 0644 vm-systemd/qubes-misc.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
 	install -m 0755 network/qubes-iptables $(DESTDIR)$(LIBDIR)/qubes/init/
 	install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \
 		$(DESTDIR)/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
@@ -138,7 +137,6 @@ install-sysvinit: install-init
 	install vm-init.d/qubes-updates-proxy $(DESTDIR)/etc/init.d/
 	install vm-init.d/qubes-updates-proxy-forwarder $(DESTDIR)/etc/init.d/
 	install -D vm-init.d/qubes-core.modules $(DESTDIR)/etc/sysconfig/modules/qubes-core.modules
-	install -D vm-init.d/qubes-misc.modules $(DESTDIR)/etc/sysconfig/modules/qubes-misc.modules
 	install network/qubes-iptables $(DESTDIR)/etc/init.d/
 
 install-rh: install-systemd install-systemd-dropins install-sysvinit

+ 0 - 1
debian/qubes-core-agent.install

@@ -42,7 +42,6 @@ etc/sysctl.d/80-qubes.conf
 etc/systemd/system/haveged.service
 etc/udev/rules.d/50-qubes-misc.rules
 lib/modules-load.d/qubes-core.conf
-lib/modules-load.d/qubes-misc.conf
 lib/systemd/system-preset/75-qubes-vm.preset
 lib/systemd/system/ModemManager.service.d/30_qubes.conf
 lib/systemd/system/NetworkManager-wait-online.service.d/30_qubes.conf

+ 0 - 2
rpm_spec/core-agent.spec

@@ -694,7 +694,6 @@ The Qubes core startup configuration for SysV init (or upstart).
 /etc/init.d/qubes-qrexec-agent
 /etc/init.d/qubes-updates-proxy-forwarder
 /etc/sysconfig/modules/qubes-core.modules
-/etc/sysconfig/modules/qubes-misc.modules
 
 %post sysvinit
 
@@ -767,7 +766,6 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/qubes-updates-proxy-forwarder.socket
 /lib/systemd/system-preset/%qubes_preset_file
 /lib/modules-load.d/qubes-core.conf
-/lib/modules-load.d/qubes-misc.conf
 /lib/systemd/system/chronyd.service.d/30_qubes.conf
 /lib/systemd/system/crond.service.d/30_qubes.conf
 /lib/systemd/system/cups.service.d/30_qubes.conf

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

@@ -1 +0,0 @@
-modprobe dummy-hcd 2>/dev/null || true

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

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