From 3312a2fd9097636fccd7c439369926a806956221 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 21 Feb 2013 08:11:50 -0800 Subject: [PATCH] mini-x-session: Fix starting of x-session We need to use sudo semantics since it does not start correctly with su. Added RDEPENDS to ensure it's present on target. The SESSION_DIR test was constructed incorrectly, so fixed it. (From OE-Core rev: badf3a32b9737f2ad6f9c9ff2fe623fe17295946) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/mini-x-session/files/mini-x-session | 5 +++-- meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mini-x-session/files/mini-x-session b/meta/recipes-graphics/mini-x-session/files/mini-x-session index 91f1592c25..dca655a913 100644 --- a/meta/recipes-graphics/mini-x-session/files/mini-x-session +++ b/meta/recipes-graphics/mini-x-session/files/mini-x-session @@ -17,13 +17,14 @@ exec /etc/mini_x/session fi MINI_X_SESSION_DIR=/etc/mini_x/session.d -if [ -d "$MINI_X_SESSION_DIR"]; then +if [ -d "$MINI_X_SESSION_DIR" ]; then # Execute session file on behalf of file owner find $MINI_X_SESSION_DIR -type f | while read SESSIONFILE; do set +e USERNAME=`stat -c %U $SESSIONFILE` # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] - su -l -c '$SESSIONFILE&' $USERNAME +# su -l -c '$SESSIONFILE&' $USERNAME + sudo -b -i -u $USERNAME $SESSIONFILE& set -e done fi diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb index 8106cbbf55..3819ee350e 100644 --- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb @@ -13,6 +13,8 @@ RCONFLICTS_${PN} = "matchbox-common" SRC_URI = "file://mini-x-session" S = "${WORKDIR}" +RDEPENDS_${PN} = "sudo" + inherit update-alternatives ALTERNATIVE_${PN} = "x-session-manager"