summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/x11-common
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-10-27 16:16:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-02 08:58:01 +0000
commite8e37cff2aaac25b046236be59e86b83611330cf (patch)
tree429713c2e80ac7417fb2a7c8032213d23d0a45f5 /meta/recipes-graphics/x11-common
parentd9fc7ba254cfe3d60555fffeb09a294e1de7256b (diff)
downloadpoky-e8e37cff2aaac25b046236be59e86b83611330cf.tar.gz
xserver-nodm-init: Use useradd to add the xuser for rootless X
This also address an issue with dbus and connman, since connmand needs to start as the xuser in the rootless X situation. Fixes: [YOCTO #1699] (From OE-Core rev: 6823a32035de5d0bcd82a3b41a6ad536aaddbc58) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/x11-common')
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb28
1 files changed, 10 insertions, 18 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index ea4222df77..dbc1c42003 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4SECTION = "x11" 4SECTION = "x11"
5PR = "r26" 5PR = "r28"
6RDEPENDS_${PN} = "sudo" 6RDEPENDS_${PN} = "sudo"
7 7
8SRC_URI = "file://xserver-nodm \ 8SRC_URI = "file://xserver-nodm \
@@ -23,23 +23,15 @@ do_install() {
23 fi 23 fi
24} 24}
25 25
26pkg_postinst_${PN} () { 26inherit update-rc.d useradd
27 if [ "x$D" != "x" ] ; then
28 exit 1
29 fi
30
31 if [ -f /etc/X11/Xusername ]; then
32 # create the rootless X user, and add user to group tty, video, audio
33 username=`cat /etc/X11/Xusername`
34 adduser --disabled-password $username
35 # FIXME: use addgroup if busybox addgroup is ready
36 sed -i -e "s/^video:.*/&${username}/g" /etc/group
37 sed -i -e "s/^tty:.*/&${username}/g" /etc/group
38 sed -i -e "s/^audio:.*/&${username}/g" /etc/group
39 fi
40}
41
42inherit update-rc.d
43 27
44INITSCRIPT_NAME = "xserver-nodm" 28INITSCRIPT_NAME = "xserver-nodm"
45INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." 29INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
30
31# Use fixed Xusername of xuser for now, this will need to be
32# fixed if the Xusername changes from xuser
33USERADD_PACKAGES = "${PN}"
34USERADD_PARAM_${PN} = "--system --no-create-home \
35 --shell /bin/false --groups video,tty,audio \
36 --user-group xuser"
37