[gnome-continuous-yocto/gnomeostree-3.28-rocko: 808/8267] weston-init: Don't change XDG_RUNTIME_DIR if it already exists



commit a6da50648378a54fb9770ed5700fb44e8a7be2f1
Author: Tom Hochstein <tom hochstein nxp com>
Date:   Thu Jun 9 14:27:06 2016 -0500

    weston-init: Don't change XDG_RUNTIME_DIR if it already exists
    
    In the case that XDG_RUNTIME_DIR already exists, the mkdir --parents
    at least does nothing, but the chmod could overwrite the desired
    file mode settings.
    
    (From OE-Core rev: 9f539d03138817b7b740ed1895000704e4a475d0)
    
    Signed-off-by: Tom Hochstein <tom hochstein nxp com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../wayland/weston-init/weston-start               |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start 
b/meta/recipes-graphics/wayland/weston-init/weston-start
index 4b41576..5b7604f 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -65,8 +65,10 @@ fi
 
 if test -z "$XDG_RUNTIME_DIR"; then
     export XDG_RUNTIME_DIR=/run/user/`id -u`
-    mkdir --parents $XDG_RUNTIME_DIR
-    chmod 0700 $XDG_RUNTIME_DIR
+    if ! test -d "$XDG_RUNTIME_DIR"; then
+        mkdir --parents $XDG_RUNTIME_DIR
+        chmod 0700 $XDG_RUNTIME_DIR
+    fi
 fi
 
 exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]