1 files changed, 7 insertions, 2 deletions

diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index 59bd413b49..ec8f2afb22 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -47,9 +47,14 @@ base_passwd_sstate_postinst() {
                 # put these files in the target sysroot so they can
                 # be used by recipes which use custom user/group
                 # permissions.
+                # Install passwd.master and group.master to sysconfdir and mv
+                # them to make sure they are atomically install.
                 install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir}
-                install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/passwd.master ${STAGING_DIR_TARGET}${sysconfdir}/passwd
-                install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/group.master ${STAGING_DIR_TARGET}${sysconfdir}/group
+                for i in passwd group; do
+                        install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/$i.master \
+                                ${STAGING_DIR_TARGET}${sysconfdir}/
+                        mv ${STAGING_DIR_TARGET}${sysconfdir}/$i.master ${STAGING_DIR_TARGET}${sysconfdir}/$i
+                done
         fi
 }