summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <iwienand@redhat.com>2017-12-07 13:57:38 +1100
committerIan Wienand <iwienand@redhat.com>2017-12-07 13:59:51 +1100
commitdcbb7e7ebb06407a6400467721c4a99eaee67ce4 (patch)
treec51a2efbf4f39f78502c3e3fc9e143025454da71
parent7470ee26e03e484c807e7b49a1ae6ad21242c3a2 (diff)
ironic-agent: don't remove makeHEADmaster
It turns out make has always been a tacit dependency of openssl as it ships a Makefile for certificates [1]. This just recently changed to be a hard dependency in F27, so this now fails as openssl is a dependency of protected packages such as dnf. Since it's always been wrong to remove it, we take it out of the purge list. [1] https://bugzilla.redhat.com/show_bug.cgi?id=783446 Change-Id: I69efb3a56878ab97c4587bbbf5356bea752f2846
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Dec 2017 21:23:09 +0000 Reviewed-on: https://review.openstack.org/526257 Project: openstack/diskimage-builder Branch: refs/heads/master
-rwxr-xr-xdiskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages2
1 files changed, 1 insertions, 1 deletions
diff --git a/diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages b/diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages
index c4d7600..72b4210 100755
--- a/diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages
+++ b/diskimage_builder/elements/ironic-agent/finalise.d/99-remove-extra-packages
@@ -18,7 +18,7 @@ if [ $DISTRO_NAME = 'fedora' ] ; then
18 18
19 install-packages -e kernel-debug-devel gcc fedora-logos \ 19 install-packages -e kernel-debug-devel gcc fedora-logos \
20 rsync pykickstart \ 20 rsync pykickstart \
21 make genisoimage tcpdump \ 21 genisoimage tcpdump \
22 man-db kbd-misc \ 22 man-db kbd-misc \
23 plymouth cronie ${_remove_yum} 23 plymouth cronie ${_remove_yum}
24 24