From 68d98179f00a723c2be9ff9107237268a62c539b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 25 Jun 2017 22:46:36 +0200 Subject: [PATCH] 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. --- Makefile | 2 -- debian/qubes-core-agent.install | 1 - rpm_spec/core-agent.spec | 2 -- vm-init.d/qubes-misc.modules | 1 - vm-systemd/qubes-misc.conf | 1 - 5 files changed, 7 deletions(-) delete mode 100755 vm-init.d/qubes-misc.modules delete mode 100644 vm-systemd/qubes-misc.conf diff --git a/Makefile b/Makefile index 2b33e2e..8264a59 100644 --- a/Makefile +++ b/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 diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 1be477f..95413aa 100644 --- a/debian/qubes-core-agent.install +++ b/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 diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index 3cc098f..3136883 100644 --- a/rpm_spec/core-agent.spec +++ b/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 diff --git a/vm-init.d/qubes-misc.modules b/vm-init.d/qubes-misc.modules deleted file mode 100755 index 4af1be3..0000000 --- a/vm-init.d/qubes-misc.modules +++ /dev/null @@ -1 +0,0 @@ -modprobe dummy-hcd 2>/dev/null || true diff --git a/vm-systemd/qubes-misc.conf b/vm-systemd/qubes-misc.conf deleted file mode 100644 index e799241..0000000 --- a/vm-systemd/qubes-misc.conf +++ /dev/null @@ -1 +0,0 @@ -dummy-hcd