[oe-commits] [openembedded-core] 23/25: initscripts: populate-volatile: suppress read-only-rootfs warnings

[git at git.openembedded.org]

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

commit 765ee275f5499254b1f09e394c757072bea5f459
Author: André Draszik <adraszik at tycoint.com>
AuthorDate: Tue Dec 20 09:02:40 2016 +0000

    initscripts: populate-volatile: suppress read-only-rootfs warnings
    
    rm: can't remove '/etc/resolv.conf': Read-only file system
    ln: /etc/resolv.conf: File exists
    
    /etc/default/volatiles contains an entry:
    l root root 0644 /etc/resolv.conf /var/run/resolv.conf
    
    which causes populate-volatile.sh to execute the following in link_file():
      if [ -L \"$2\" ]; then
        [ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
      elif [ -d \"$2\" ]; then
        ...
    
    At the time the image is created, /etc/resolv.conf is already a
    symlink to /var/run/resolv.conf, but at boot time when
    populate-volatiles.sh is run, /var/run/resolv.conf doesn't
    exist, causing it to try to rm -f and ln -sf which of course
    fails due to the read-only filesystem.
    
    [YOCTO #10814]
    
    Signed-off-by: André Draszik <adraszik at tycoint.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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 cf0d2bf..22a71ec 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -70,7 +70,7 @@ mk_dir() {
 link_file() {
 	EXEC="
 	if [ -L \"$2\" ]; then
-		[ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && { rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
+		[ \"\$(readlink -f \"$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.