From 5eb37b999e6babb439c7840f85e767e236194459 Mon Sep 17 00:00:00 2001 From: adam kaminski Date: Mon, 25 Jul 2022 23:45:52 -0400 Subject: [PATCH] Update domainjoin_unix_script to fix SUSE issues There was already variables for the SUSE distribution release and service pack but the SUSEConect to enable PackageHub was hardcoded for 15.1. Newer releases have been out for years with 15.4 being recently released in 06/2022. It's not clear to me why NetworkManager was being installed. This should not be used on SLE Server deployments. NetworkManager is only supported by SUSE for desktop workloads with SLED or the Workstation extension. All server certifications are done with wicked as the network configuration tool and using NetworkManager may invalidate them. NetworkManager is not supported by SUSE for any server workloads. --- agent/plugins/domainjoin/domainjoin_unix_script.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/plugins/domainjoin/domainjoin_unix_script.go b/agent/plugins/domainjoin/domainjoin_unix_script.go index a3ff71a71..644d7e973 100755 --- a/agent/plugins/domainjoin/domainjoin_unix_script.go +++ b/agent/plugins/domainjoin/domainjoin_unix_script.go @@ -390,14 +390,14 @@ install_components() { exit 1 fi if [ "$SUSE_MAJOR_VERSION" -eq "15" ]; then - sudo SUSEConnect -p PackageHub/15.1/x86_64 + sudo SUSEConnect -p PackageHub/$SUSE_MAJOR_VERSION.$SUSE_MINOR_VERSION/x86_64 if [ $? -ne 0 ]; then sudo SUSEConnect fi fi LINUX_DISTRO='SUSE' sudo zypper update -y - sudo zypper -n install realmd adcli sssd sssd-tools sssd-ad samba-client krb5-client samba-winbind krb5-client bind-utils python3 openldap2-client NetworkManager + sudo zypper -n install realmd adcli sssd sssd-tools sssd-ad samba-client krb5-client samba-winbind krb5-client bind-utils python3 openldap2-client if [ $? -ne 0 ]; then return 1 fi