From 95c3c54fede8de2a453cbbf603d7b0e084f57155 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 23 Feb 2022 12:43:06 -0800 Subject: [PATCH] Force use of NetworkManager with glean on Rocky Linux Rocky Linux is very similar to CentOS 8. CentOS 8 required and forced NetworkManager with glean so we update dib to do the same for Rocky. Change-Id: I145e57d61059c2f34dc2d4810e83809b71c6aade --- .../simple-init/environment.d/15-simple-init-networkmanager | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager b/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager index bb35fa68..8b926867 100644 --- a/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager +++ b/diskimage_builder/elements/simple-init/environment.d/15-simple-init-networkmanager @@ -1,12 +1,12 @@ -if [[ ${DISTRO_NAME} =~ (centos|fedora) ]]; then +if [[ ${DISTRO_NAME} =~ (centos|fedora|rocky) ]]; then export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-1} else export DIB_SIMPLE_INIT_NETWORKMANAGER=${DIB_SIMPLE_INIT_NETWORKMANAGER:-0} fi -if [[ ${DISTRO_NAME} == "centos" && $DIB_RELEASE > 7 ]] || [[ ${DISTRO_NAME} == "fedora" ]]; then +if [[ (${DISTRO_NAME} == "centos" || ${DISTRO_NAME} == "rocky") && $DIB_RELEASE > 7 ]] || [[ ${DISTRO_NAME} == "fedora" ]]; then if [[ $DIB_SIMPLE_INIT_NETWORKMANAGER == 0 ]]; then - echo "simple-init only supports NetworkManager mode on Fedora and CentOS 8" + echo "simple-init only supports NetworkManager mode on Fedora and CentOS/Rocky 8" exit 1 fi fi