[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6139/8267] initscripts: Populate volatile from existing file

[Emmanuele Bassi <ebassi src gnome org>]

commit 82fd7bbfaed9694fd699e2803fbf9a4932b9cfc9
Author: David Vincent <freesilicon gmail com>
Date:   Fri Jun 2 17:16:03 2017 +0200

    initscripts: Populate volatile from existing file
    
    In some cases, it may be useful to populate a volatile file from an
    existing one, e.g. a file in a read-only rootfs that may be edited in a
    read-write destination.
    
    To provide this behavior, creation of volatile files has been updated to
    copy a file which has been given in the <linksource> field. If set to
    none, the current behavior is preserved.
    
    (From OE-Core rev: d44816bedadeef420226dc5efb67065cfcda6634)
    
    Signed-off-by: David Vincent <freesilicon gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initscripts-1.0/populate-volatile.sh           |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 22a71ec..35316ec 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -25,8 +25,18 @@ COREDEF="00_core"
 [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
 
 create_file() {
+       EXEC=""
+       [ -z "$2" ] && {
+               EXEC="
+               touch \"$1\";
+               "
+       } || {
+               EXEC="
+               cp \"$2\" \"$1\";
+               "
+       }
        EXEC="
-       touch \"$1\";
+       ${EXEC}
        chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1;
        chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
 
@@ -187,7 +197,9 @@ apply_cfgfile() {
 
                case "${TTYPE}" in
                        "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
-                               create_file "${TNAME}"
+                               TSOURCE="$TLTARGET"
+                               [ "${TSOURCE}" = "none" ] && TSOURCE=""
+                               create_file "${TNAME}" "${TSOURCE}" &
                                ;;
                        "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
                                mk_dir "${TNAME}"