[oe-commits] [openembedded-core] 01/35: initscripts: remove warnings on read-only-rootfs (again)

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit fb028a0a25c02ab56ad262afd8e6e9495a44673d
Author: Martin Hundebøll <martin at geanix.com>
AuthorDate: Wed Aug 21 12:25:53 2019 +0200

    initscripts: remove warnings on read-only-rootfs (again)
    
    When the populate-volatile.sh initscript tests if a configured symlink
    is already in place, it uses readlink with the '-f' (follow) option:
    
    > [ "$(readlink -f $source)" = "$dest" ]
    
    If the test fails, it proceeds to delete the exisiting folder/file, and
    create the configured symlink.
    
    However, the '-f' option to readlink makes it follow symlinks pointing
    at symlinks. If the $dest argument is a symlink, the above test fails,
    and warnings are printed due to changing a read-only rootfs.
    
    This is the case for /tmp, and /etc/resolv.conf:
    > /tmp -> /var/tmp -> /var/volatile/tmp
    > /etc/resolv.conf -> /var/run/resolv.conf -> /run/resolv.conf
    
    Fix the warnings by removing the '-f' option, so that the test matches
    the configuration.
    
    [ YOCTO #10814 ]
    
    Signed-off-by: Martin Hundebøll <martin at geanix.com>
    Signed-off-by: Jacob Kroon <jacob.kroon at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 6f965a6..1c525b7 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -80,7 +80,7 @@ mk_dir() {
 link_file() {
 	EXEC="
 	if [ -L \"$2\" ]; then
-		[ \"\$(readlink -f \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
+		[ \"\$(readlink \"$2\")\" != \"$1\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
 	elif [ -d \"$2\" ]; then
 		if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then
 			cp -a $2/* $1 2>/dev/null;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.