From 588db835a385e56a213e55259bd8818358e8b35a Mon Sep 17 00:00:00 2001 From: Steve Mokris Date: Sat, 4 Apr 2020 15:46:46 -0400 Subject: [PATCH] Add support for CentOS 8. --- tools/prepare-image/linux-prepare-image | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/prepare-image/linux-prepare-image b/tools/prepare-image/linux-prepare-image index b6ab08a1..06fa3048 100755 --- a/tools/prepare-image/linux-prepare-image +++ b/tools/prepare-image/linux-prepare-image @@ -187,12 +187,20 @@ function cleanup_cloud_init { } function prepare_centos() { - # Cleaning up package cache. - yum clean all 2>&1 >/dev/null - - # TODO: Remove this? Doesn't seem necessary - # Make sure locale is set to prevent error when system is SSH'ed into. - localedef --no-archive -i en_US -f UTF-8 en_US.UTF-8 + case "$VERSION_ID" in + 8) + # Cleaning up package cache. + dnf clean all 2>&1 >/dev/null + ;; + 7) + # Cleaning up package cache. + yum clean all 2>&1 >/dev/null + + # TODO: Remove this? Doesn't seem necessary + # Make sure locale is set to prevent error when system is SSH'ed into. + localedef --no-archive -i en_US -f UTF-8 en_US.UTF-8 + ;; + esac # Remove hostname from /etc/sysconfig/network sed -i '/^HOSTNAME=/d' /etc/sysconfig/network