Backport a couple of fixes

* Workaround for boo#1231244
* Remove already fixed workaround

Signed-off-by: David Cassany <[email protected]>

---------

Signed-off-by: David Cassany <[email protected]>
(cherry picked from commit 55770a2)

Author: davidcassany

Dockerfile

@@ -60,10 +60,6 @@ RUN ARCH=$(uname -m); \
         lvm2 && \
     zypper cc -a
 
-# This a temporary workaround, glibc package got restructured into subpackages and now mtools is not
-# requiring the apropriate package as a dependency (boo#1225982)
-RUN zypper install -y --no-recommends glibc-gconv-modules-extra && zypper cc -a 
-
 # Copy the built CLI
 COPY --from=elemental-bin /usr/bin/elemental /usr/bin/elemental
 

examples/green/Dockerfile

@@ -74,6 +74,9 @@ COPY --from=toolkit /usr/bin/elemental /usr/bin/elemental
 RUN systemctl enable NetworkManager.service && \
     systemctl enable sshd.service
 
+# Workaround to make sure there are no pending sysusers to be created (boo#1231244)
+RUN systemd-sysusers
+
 # This is for automatic testing purposes, do not do this in production.
 RUN echo "PermitRootLogin yes" > /etc/ssh/sshd_config.d/rootlogin.conf