mini-x-session: Fix runtime when using without session contents
The script where behaving badly when the session directory does not exist and also lacking a dependency to 'sudo'. Instead of adding a dependency on 'sudo' we use 'su' as done in xserver-common. (From OE-Core rev: 84b58ed421fd14796ddcbc4cc7fc13a5a098d6cc) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3ca9ff71dd
commit
982eefe22d
|
@ -17,14 +17,16 @@ exec /etc/mini_x/session
|
|||
fi
|
||||
|
||||
MINI_X_SESSION_DIR=/etc/mini_x/session.d
|
||||
|
||||
# Execute session file on behalf of file owner
|
||||
for SESSIONFILE in $MINI_X_SESSION_DIR/*; do
|
||||
set +e
|
||||
USERNAME=`stat -c %U $SESSIONFILE`
|
||||
sudo -b -i -u $USERNAME $SESSIONFILE&
|
||||
set -e
|
||||
done
|
||||
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
|
||||
set -e
|
||||
done
|
||||
fi
|
||||
|
||||
# This resolution is big enough for hob2's max window size.
|
||||
xrandr -s 1024x768
|
||||
|
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "Mini X session files for poky"
|
|||
HOMEPAGE = "http://www.yoctoproject.org"
|
||||
BUGTRACKER = "http://bugzilla.pokylinux.org"
|
||||
|
||||
PR = "r3"
|
||||
PR = "r4"
|
||||
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://mini-x-session;endline=5;md5=b6430bffbcf05f9760e72938826b7487"
|
||||
|
|
Loading…
Reference in New Issue