Patchwork [1/2] xserver-nodm-init: Fix xuser creation

login
register
mail settings
Submitter Zhai, Edwin
Date Dec. 16, 2011, 7:53 a.m.
Message ID <684530c1b7e5aab3e0f3f6f8bbe64b5fb839eff3.1324021777.git.edwin.zhai@intel.com>
Download mbox | patch
Permalink /patch/17099/
State Accepted
Commit 012b6054cd5757edd6b1eb31789718bb97c26193
Headers show

Comments

Zhai, Edwin - Dec. 16, 2011, 7:53 a.m.
From: Zhai Edwin <edwin.zhai@intel.com>

Rootless X start fail as xuser has no home and shell. This patch fix it.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../x11-common/xserver-nodm-init.bb                |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Saul Wold - Dec. 16, 2011, 5:52 p.m.
On 12/15/2011 11:53 PM, edwin.zhai@intel.com wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> Rootless X start fail as xuser has no home and shell. This patch fix it.
>
> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
> ---
>   .../x11-common/xserver-nodm-init.bb                |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> index dbc1c42..99ef72e 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 = "r28"
> +PR = "r29"
>   RDEPENDS_${PN} = "sudo"
>
>   SRC_URI = "file://xserver-nodm \
> @@ -31,7 +31,7 @@ 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 \
> +USERADD_PARAM_${PN} = "--create-home \
> +                       --groups video,tty,audio \
>                          --user-group xuser"
>
I think that this should still be a --system account, I missed that when 
I first looked at this patch.

Sau!

Patch

diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index dbc1c42..99ef72e 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 = "r28"
+PR = "r29"
 RDEPENDS_${PN} = "sudo"
 
 SRC_URI = "file://xserver-nodm \
@@ -31,7 +31,7 @@  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 \
+USERADD_PARAM_${PN} = "--create-home \
+                       --groups video,tty,audio \
                        --user-group xuser"