sed -i destroys symlinks

If /etc/passwd is a symlink, sed -i on same file will replace the
symlink with a new file. Prevent that by adding --follow-symlinks
option to sed

(From OE-Core rev: 6ec004b2e7b4342465af8e5e6cc66041834821a0)

Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes-recipe/rootfs-postcommands.bbclass b/meta/classes-recipe/rootfs-postcommands.bbclass
index 06388b72fb..29ee74932a 100644
--- a/meta/classes-recipe/rootfs-postcommands.bbclass
+++ b/meta/classes-recipe/rootfs-postcommands.bbclass
@@ -241,10 +241,10 @@ read_only_rootfs_hook () {
 #
 zap_empty_root_password () {
         if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
-                sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow
+                sed --follow-symlinks -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/shadow
         fi
         if [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
-                sed -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd
+                sed --follow-symlinks -i 's%^root::%root:*:%' ${IMAGE_ROOTFS}/etc/passwd
         fi
 }
 
diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass
index 863cb7b76c..f1a7a9695d 100644
--- a/meta/classes/useradd_base.bbclass
+++ b/meta/classes/useradd_base.bbclass
@@ -160,7 +160,7 @@ perform_passwd_expire () {
         local username=`echo "$opts" | awk '{ print $NF }'`
         local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
         if test "x$user_exists" != "x"; then
-                eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true
+                eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO sed -follow-symlinks -i \''s/^\('$username':[^:]*\):[^:]*:/\1:0:/'\' $rootdir/etc/shadow \" || true
                 local passwd_lastchanged="`grep "^$username:" $rootdir/etc/shadow | cut -d: -f3`"
                 if test "x$passwd_lastchanged" != "x0"; then
                         bbfatal "${PN}: passwd --expire operation did not succeed."