From 110f37d82f6d4e610f463beb4bd126a78841ce57 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 16 Dec 2017 10:00:24 -0800 Subject: [PATCH] Drop workaround for libcrypt/libcrypt-nss. glibc has completely dropped libcrypt-nss now so we need to just drop this workaround. --- fedora-arm-base.ks | 7 ------- fedora-disk-base.ks | 7 ------- 2 files changed, 14 deletions(-) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index ceeea87..13264a7 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -48,13 +48,6 @@ initial-setup-gui # make sure all the locales are available for inital0-setup and anaconda to work glibc-all-langpacks -# workaround for consequence of RHBZ #1324623: without this, with -# yum-based creation tools, compose fails due to conflict between -# libcrypt and libcrypt-nss. dnf does not seem to have the same -# issue, so this may be dropped when appliance-creator is ported -# to dnf. -libcrypt-nss --libcrypt %end %post diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index 5327c73..604d9af 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -55,13 +55,6 @@ initial-setup # make sure all the locales are available for inital0-setup and anaconda to work glibc-all-langpacks -# workaround for consequence of RHBZ #1324623: without this, with -# yum-based creation tools, compose fails due to conflict between -# libcrypt and libcrypt-nss. dnf does not seem to have the same -# issue, so this may be dropped when appliance-creator is ported -# to dnf. -libcrypt-nss --libcrypt %end %post