Patchwork [Pull,v2,2/4] xserver-nodm-init: Add xuser (hardcoded)

login
register
mail settings
Submitter Saul Wold
Date Nov. 1, 2011, 9:44 p.m.
Message ID <453f61fd0043629181379d5d3766c118bdd46dd2.1320183757.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14159/
State New, archived
Headers show

Comments

Saul Wold - Nov. 1, 2011, 9:44 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../x11-common/xserver-nodm-init.bb                |   30 +++++++------------
 1 files changed, 11 insertions(+), 19 deletions(-)
Lauri Hintsala - Nov. 2, 2011, 6:11 a.m.
Hi Saul,

On 11/01/2011 11:44 PM, Saul Wold wrote:
> Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   .../x11-common/xserver-nodm-init.bb                |   30 +++++++------------
>   1 files changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> index ea4222d..5b06bc6 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)"
>   LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>   SECTION = "x11"
> -PR = "r26"
> +PR = "r28"
>   RDEPENDS_${PN} = "sudo"
>
>   SRC_URI = "file://xserver-nodm \
> @@ -19,27 +19,19 @@ do_install() {
>       install xserver-nodm ${D}/etc/init.d
>       if [ "${ROOTLESS_X}" = "1" ] ; then
>           install -d ${D}/etc/X11
> -        install Xusername ${D}/etc/X11
> +	install Xusername ${D}/etc/X11

Is this indentation change a typo?


Lauri


>       fi
>   }
>
> -pkg_postinst_${PN} () {
> -    if [ "x$D" != "x" ] ; then
> -        exit 1
> -    fi
> -
> -    if [ -f /etc/X11/Xusername ]; then
> -        # create the rootless X user, and add user to group tty, video, audio
> -        username=`cat /etc/X11/Xusername`
> -        adduser --disabled-password $username
> -        # FIXME: use addgroup if busybox addgroup is ready
> -        sed -i -e "s/^video:.*/&${username}/g" /etc/group
> -        sed -i -e "s/^tty:.*/&${username}/g" /etc/group
> -        sed -i -e "s/^audio:.*/&${username}/g" /etc/group
> -    fi
> -}
> -
> -inherit update-rc.d
> +inherit update-rc.d useradd
>
>   INITSCRIPT_NAME = "xserver-nodm"
>   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
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --no-create-home \
> +                       --shell /bin/false --groups video,tty,audio \
> +                       --user-group xuser"
> +
Richard Purdie - Nov. 2, 2011, 8:23 a.m.
On Wed, 2011-11-02 at 08:11 +0200, Lauri Hintsala wrote:
> Hi Saul,
> 
> On 11/01/2011 11:44 PM, Saul Wold wrote:
> > Signed-off-by: Saul Wold<sgw@linux.intel.com>
> > ---
> >   .../x11-common/xserver-nodm-init.bb                |   30 +++++++------------
> >   1 files changed, 11 insertions(+), 19 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> > index ea4222d..5b06bc6 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)"
> >   LICENSE = "GPLv2"
> >   LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> >   SECTION = "x11"
> > -PR = "r26"
> > +PR = "r28"
> >   RDEPENDS_${PN} = "sudo"
> >
> >   SRC_URI = "file://xserver-nodm \
> > @@ -19,27 +19,19 @@ do_install() {
> >       install xserver-nodm ${D}/etc/init.d
> >       if [ "${ROOTLESS_X}" = "1" ] ; then
> >           install -d ${D}/etc/X11
> > -        install Xusername ${D}/etc/X11
> > +	install Xusername ${D}/etc/X11
> 
> Is this indentation change a typo?

Saul fixed this in the v3 which I've taken.

Cheers,

Richard

Patch

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index ea4222d..5b06bc6 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)"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r26"
+PR = "r28"
 RDEPENDS_${PN} = "sudo"
 
 SRC_URI = "file://xserver-nodm \
@@ -19,27 +19,19 @@  do_install() {
     install xserver-nodm ${D}/etc/init.d
     if [ "${ROOTLESS_X}" = "1" ] ; then
         install -d ${D}/etc/X11
-        install Xusername ${D}/etc/X11
+	install Xusername ${D}/etc/X11
     fi
 }
 
-pkg_postinst_${PN} () {
-    if [ "x$D" != "x" ] ; then
-        exit 1
-    fi
-
-    if [ -f /etc/X11/Xusername ]; then
-        # create the rootless X user, and add user to group tty, video, audio
-        username=`cat /etc/X11/Xusername`
-        adduser --disabled-password $username
-        # FIXME: use addgroup if busybox addgroup is ready
-        sed -i -e "s/^video:.*/&${username}/g" /etc/group
-        sed -i -e "s/^tty:.*/&${username}/g" /etc/group
-        sed -i -e "s/^audio:.*/&${username}/g" /etc/group
-    fi
-}
-
-inherit update-rc.d
+inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
 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
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home \
+                       --shell /bin/false --groups video,tty,audio \
+                       --user-group xuser"
+