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 <awilliam@redhat.com>
This commit is contained in:
parent
7e826a7508
commit
255b48f233
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user