From patchwork Wed Jun 13 11:20:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,2/2] connman: make useradd parameters consistent with rootless X Date: Wed, 13 Jun 2012 11:20:25 -0000 From: Laurentiu Palcu X-Patchwork-Id: 29787 Message-Id: <1339586425-702-3-git-send-email-laurentiu.palcu@intel.com> To: openembedded-core@lists.openembedded.org Both connman and rootless X share the same xuser. However, useradd parameters are not consistent and if connman runs useradd first, rootless X will be broken. [Yocto #2467] Signed-off-by: Laurentiu Palcu --- meta/recipes-connectivity/connman/connman.inc | 8 ++++++-- meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- .../x11-common/xserver-nodm-init.bb | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 4fb7b43..3412323 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,6 +20,8 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " +INC_PR = "r6" + TIST = "--enable-tist" TIST_powerpc = "" @@ -46,9 +48,11 @@ EXTRA_OECONF += "\ INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." +# IMPORTANT: because xuser is shared with rootless X, please make sure the +# USERADD_PARAM is in sync with the one in xserver-nodm-init.bb USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home \ - --shell /bin/false --groups video,tty,audio \ +USERADD_PARAM_${PN} = "--create-home \ + --groups video,tty,audio \ --user-group xuser" inherit autotools pkgconfig update-rc.d useradd diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb index ec3d147..898fb11 100644 --- a/meta/recipes-connectivity/connman/connman_0.79.bb +++ b/meta/recipes-connectivity/connman/connman_0.79.bb @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ file://test-set-ipv6-method-api-fix.patch \ file://connman" S = "${WORKDIR}/git" -PR = "r5" +PR = "${INC_PR}.0" diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index 1b95261..8fca056 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -30,6 +30,8 @@ INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." # Use fixed Xusername of xuser for now, this will need to be # fixed if the Xusername changes from xuser +# IMPORTANT: because xuser is shared with connman, please make sure the +# USERADD_PARAM is in sync with the one in connman.inc USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--create-home \ --groups video,tty,audio \