Patchwork [2/2] builder: fix adduser breakage with password

login
register
mail settings
Submitter Cristian Iorga
Date Nov. 21, 2012, 7:54 p.m.
Message ID <1353527664-4464-2-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/39429/
State Accepted
Commit 29f2ae0305b9a3db9632a8fe078fedc88f89a9ad
Headers show

Comments

Cristian Iorga - Nov. 21, 2012, 7:54 p.m.
Build Appliance needs to have for the builder
user a password set. However, the useradd.bbclass
requires the last parameter to be the user's group
name. Previously, the password was the last
parameter to useradd command.
Fixed using the right order for parameters.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 meta/recipes-graphics/builder/builder_0.1.bb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb
index 41871d6..78d41e5 100644
--- a/meta/recipes-graphics/builder/builder_0.1.bb
+++ b/meta/recipes-graphics/builder/builder_0.1.bb
@@ -1,7 +1,7 @@ 
 SUMMARY = "New user to do specific job"
 DESCRIPTION = "This recipe create a new user named ${PN}, who is used for specific jobs like building. The task can be auto started via mini X"
 SECTION = "x11"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://builder_hob_start.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e"
 
@@ -20,8 +20,8 @@  BUILDER_PASSWORD ?= ".gLibiNXn0P12"
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --create-home \
                        --groups video,tty,audio \
-                       --user-group ${PN} \
-                       --password ${BUILDER_PASSWORD}"
+                       --password ${BUILDER_PASSWORD} \
+                       --user-group ${PN}"
 
 do_install () {
 	install -d -m 755 ${D}${sysconfdir}/mini_x/session.d