Merge pull request #1316 from t-woerner/c10s_niddomainname

infra/image/dockerfile/c10s: Fix client part deployment for the server

infra/image/dockerfile/c10s

@@ -9,9 +9,16 @@ dnf --assumeyes install \
     bash \
     systemd \
     procps-ng \
-    iproute; \
+    iproute \
+    hostname; \
 rm -rf /var/cache/dnf/;
 
+# Prepare for basic ipa-server-install in container
+# Address failing nis-domainname.service in the ipa-client-install step
+RUN mv /usr/bin/nisdomainname /usr/bin/nisdomainname.orig
+ADD utils/hostnamectl-wrapper /usr/bin/nisdomainname
+RUN chmod a+rx /usr/bin/nisdomainname
+
 RUN (cd /lib/systemd/system/; \
     if [ -e dbus-broker.service ] && [ ! -e dbus.service ]; then \
        ln -s dbus-broker.service dbus.service; \

infra/image/utils/hostnamectl-wrapper

@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+
+if setpriv --dump | grep -q sys_admin ; then
+	if [[ "$( basename $0 )" =~ "domainname" ]] ; then
+		/usr/bin/hostname -y "$@"
+	else
+		$0.orig "$@"
+	fi
+else
+	echo "Skipping invocation of $0 $@ in unprivileged container." >&2
+	exit
+fi