[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3879/8267] initscripts: populate-volatile: suppress read-only-rootfs warnings

[Emmanuele Bassi <ebassi src gnome org>]

commit d8c62f19da60914ec87618fd46c6df61d693355b
Author: André Draszik <adraszik tycoint com>
Date:   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]
    
    (From OE-Core rev: 765ee275f5499254b1f09e394c757072bea5f459)
    
    Signed-off-by: André Draszik <adraszik tycoint com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initscripts-1.0/populate-volatile.sh           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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;