From 6803bae6d48b231eddd2a11427679e3f7618f332 Mon Sep 17 00:00:00 2001 From: Vladimir Slavik Date: Fri, 29 Jan 2021 15:09:17 +0100 Subject: [PATCH] Use image dependencies metapackage The difference between the anaconda-install-{env,img}-deps packages is how they treat dependencies. The -env package leaves some dependencies as weak to allow less featureful builds. The -img package hard-requires everything Anaconda could potentially use and ensures everything works. For boot.iso, the latter is preferable. Its usage moves some things from the templates to that package. --- share/templates.d/99-generic/runtime-install.tmpl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index 619e64b7..bc561f58 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -2,7 +2,7 @@ <%page args="basearch, product"/> ## anaconda package -installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-env-deps +installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps ## Other available payloads installpkg dnf installpkg rpm-ostree ostree @@ -104,9 +104,6 @@ installpkg xfsdump ## extra storage packages # hostname is needed for iscsi to work, see RHBZ#1593917 installpkg udisks2 udisks2-iscsi hostname -%if basearch in ("i386", "x86_64"): - installpkg fcoe-utils -%endif ## extra libblockdev plugins installpkg libblockdev-lvm-dbus @@ -119,9 +116,6 @@ installpkg nss-tools ## don't tell dnf what to pick it picks lxpolkit, which drags in gtk2 installpkg polkit-gnome -## enable swap on zram -installpkg zram-generator-defaults - ## SELinux support installpkg selinux-policy-targeted audit