Merge pull request #43 from danwinship/test-nofqdn

Bug 1881182: Only use DHCPv6 hostname if no other hostname was set
openshift · Sep 25, 2020 · e8886a0 · e8886a0
2 parents f852306 + 1bbd351
commit e8886a0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/chrooted.sh b/chrooted.sh
@@ -7,7 +7,7 @@ dnf --best install -y $(cat ${PKGS_LIST_DST})
 # FIXME: we need an alternative of this packaged
 mkdir -p /etc/NetworkManager/conf.d /etc/NetworkManager/dispatcher.d
 echo -e '[main]\ndhcp=dhclient\n[connection]\nipv6.dhcp-duid=ll' > /etc/NetworkManager/conf.d/clientid.conf
-echo -e '[[ "$DHCP6_FQDN_FQDN" =~ - ]] && hostname $DHCP6_FQDN_FQDN' > /etc/NetworkManager/dispatcher.d/01-hostname
+echo -e '[[ "$DHCP6_FQDN_FQDN" =~ - ]] && [[ "$(hostname)" == localhost.localdomain ]] && hostname $DHCP6_FQDN_FQDN' > /etc/NetworkManager/dispatcher.d/01-hostname
 chmod +x /etc/NetworkManager/dispatcher.d/01-hostname
 
 # Provide a list of packages installed in the ipa-ramdisk