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

login
register
mail settings
Submitter Saul Wold
Date Nov. 1, 2011, 9:27 p.m.
Message ID <43df49f1967ebd4e5a956c601c9865f67598d52f.1320182590.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14155/
State New, archived
Headers show

Comments

Saul Wold - Nov. 1, 2011, 9:27 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(-)
Martin Jansa - Nov. 1, 2011, 9:30 p.m.
On Tue, Nov 01, 2011 at 02:27:17PM -0700, 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..1183f0e 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,audioi \

audioi?

I guess you're also using vim :)

Cheers,

> +                       --user-group xuser"
> +
> -- 
> 1.7.6.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Saul Wold - Nov. 1, 2011, 9:35 p.m.
On 11/01/2011 02:30 PM, Martin Jansa wrote:
> On Tue, Nov 01, 2011 at 02:27:17PM -0700, 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..1183f0e 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,audioi \
>
> audioi?
>
> I guess you're also using vim :)
i
good catch (fixed in the branch)
:w
:q
:-)

Sau!

>
> Cheers,
>
>> +                       --user-group xuser"
>> +
>> --
>> 1.7.6.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

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..1183f0e 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,audioi \
+                       --user-group xuser"
+