From 116bbc6a340c32e35057979ab2331a93060208e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 30 Sep 2018 22:31:04 +0200 Subject: [PATCH] lorax-templates-qubes: use qubes kernel during installation Don't try to install kernel-modules-extra, which force Fedora's kernel. Qubes kernel package is not split into several packages. Also, don't install gfs2-utils (not needed in Qubes case) which is said to pull kernel-debuginfo package. Fixes QubesOS/qubes-issues#3784 --- lorax-templates-qubes/templates/runtime-install.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lorax-templates-qubes/templates/runtime-install.tmpl b/lorax-templates-qubes/templates/runtime-install.tmpl index 15f28a6..0dd17af 100644 --- a/lorax-templates-qubes/templates/runtime-install.tmpl +++ b/lorax-templates-qubes/templates/runtime-install.tmpl @@ -14,9 +14,7 @@ installpkg rpm-ostree installpkg pigz ## kernel and firmware -## NOTE: Without explicitly including kernel-modules-extra dnf will choose kernel-debuginfo-* -## to satify a gfs2-utils kmod requirement -installpkg kernel kernel-modules kernel-modules-extra +installpkg kernel installpkg grubby %if basearch != "s390x": installpkg linux-firmware @@ -81,7 +79,7 @@ installpkg nm-connection-editor installpkg librsvg2 ## filesystem tools -installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils gfs2-utils ntfs-3g ntfsprogs +installpkg btrfs-progs jfsutils xfsprogs reiserfs-utils ntfs-3g ntfsprogs installpkg system-storage-manager installpkg device-mapper-persistent-data installpkg xfsdump