From dc5d025247fbc3d2993c2286cd9ee3c7883a40db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 1 Dec 2017 00:11:28 +0100 Subject: [PATCH] debian: include drauct module in qubes-kernel-vm-support Support dracut also on Debian systems. Fixes QubesOS/qubes-issues#3361 --- Makefile | 1 + debian/qubes-kernel-vm-support.install | 3 +++ debian/rules | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index ccdff40..fa0ace5 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ install-fedora-kernel-support: install-debian-kernel-support: $(MAKE) -C initramfs-tools install + $(MAKE) -C dracut install $(MAKE) -C kernel-modules install # expand module version rm -f debian/qubes-kernel-vm-support.dkms diff --git a/debian/qubes-kernel-vm-support.install b/debian/qubes-kernel-vm-support.install index 7e7d402..59e4153 100644 --- a/debian/qubes-kernel-vm-support.install +++ b/debian/qubes-kernel-vm-support.install @@ -1,3 +1,6 @@ usr/share/initramfs-tools/scripts/local-top/qubes_cow_setup usr/share/initramfs-tools/hooks/qubes_vm +usr/lib/dracut/modules.d/90qubes-vm/* +usr/lib/dracut/modules.d/90qubes-vm-modules/* +usr/lib/dracut/modules.d/90qubes-vm-simple/* usr/src/u2mfn-*/* diff --git a/debian/rules b/debian/rules index dcfa9aa..bbf30c9 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,8 @@ override_dh_auto_build: override_dh_auto_install: make install LIBDIR=/usr/lib DEBIANBUILD=1 PYTHON_PREFIX_ARG=--install-layout=deb make install-debian-kernel-support LIBDIR=/usr/lib DEBIANBUILD=1 + # dom0-only file + rm -f $(DESTDIR)/usr/sbin/qubes-prepare-vm-kernel override_dh_install: dh_install --fail-missing