From 255b48f23330c9de37cc0e547eca091ad186dff9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 25 Sep 2018 14:57:35 -0700 Subject: [PATCH] Move exclusions of trousers-lib and iproute-tc to minimal-common These are aiming to leave some weak dependencies out of minimal images, it seems. From @core, gnutls recommends trousers which requires trousers-lib, and iproute recommends iproute-tc. However, both are *hard* dependencies of things that include fedora-disk-base.ks. fedora-disk-workstation.ks includes fedora-disk.base.ks and fedora-workstation-common.ks, so it installs the Workstation package set, from which gnome-boxes ultimately requires iproute-tc and NetworkManager-openconnect ultimately requires trousers-lib. Prior to the change I recently got merged into DNF, DNF would silently drop gnome-boxes and NetworkManager-openconnect from the Workstation disk image because of this. With the change, it errors out on creation of the image. To make the image compose again and actually include the right packages, let's move the exclusions to fedora-minimal-common.ks, where they make more sense anyway. This does mean the packages will be pulled into other non-minimal images even if they're not strictly required there, but that doesn't seem like a big problem. Signed-off-by: Adam Williamson --- fedora-disk-base.ks | 3 +-- fedora-minimal-common.ks | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index 0520a51..fbc864f 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -46,11 +46,10 @@ rng-tools chrony bcm283x-firmware initial-setup +# Intel wireless firmware assumed never of use for disk images -iwl* -ipw* --trousers-lib -usb_modeswitch --iproute-tc -generic-release* # make sure all the locales are available for inital0-setup and anaconda to work diff --git a/fedora-minimal-common.ks b/fedora-minimal-common.ks index 42eef06..24e6ce8 100644 --- a/fedora-minimal-common.ks +++ b/fedora-minimal-common.ks @@ -3,6 +3,10 @@ -initial-setup-gui -generic-release* -glibc-all-langpacks +# recommended by iproute, we don't want it in minimal +-iproute-tc +# recommended by gnutls, we don't want it in minimal +-trousers glibc-langpack-en iw NetworkManager-wifi