Skip to contentSkip to conversation

fixes for useradd

PATCH In review Robert Yang 2 participants 6 messages Jul 28, 2015 – Aug 9, 2015

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover fixes for useradd

The following changes since commit 27d068d05239c26a3848eb101571acab54635e37:

harfbuzz: upgrade to 1.0.1 (2015-07-27 23:28:23 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/useradd
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/useradd

Robert Yang (3):
useradd_base.bbclass: print PN when bbnote/bbwarn/bbfatal useradd_base.bbclass: do not warn when the user exists
builder: fix USERADD_PARAM

 meta/classes/useradd_base.bbclass            |   58 +++++++++++++-------------
 meta/recipes-graphics/builder/builder_0.1.bb |    2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/3 useradd_base.bbclass: print PN when bbnote/bbwarn/bbfatal

Print PN will help debug:
WARNING: openssh: user sshd already exists, not re-creating it

Which is better than:
WARNING: user sshd already exists, not re-creating it

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/useradd_base.bbclass |   58 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)
meta/classes/useradd_base.bbclass +29 -29
index 4398a25..7fe83a7 100644
@@ -14,7 +14,7 @@ perform_groupadd () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing groupadd with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing groupadd with [$opts] and $retries times of retry"
 	local groupname=`echo "$opts" | awk '{ print $NF }'`
 	local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
 	if test "x$group_exists" = "x"; then

@@ -23,18 +23,18 @@ perform_groupadd () {
 			eval $PSEUDO groupadd $opts || true
 			group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
 			if test "x$group_exists" = "x"; then
-				bbwarn "groupadd command did not succeed. Retrying..."
+				bbwarn "${PN}: groupadd command did not succeed. Retrying..."
 			else
 				break
 			fi
 			count=`expr $count + 1`
 			if test $count = $retries; then
-				bbfatal "Tried running groupadd command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running groupadd command $retries times without success, giving up"
 			fi
                         sleep $count
 		done
 	else
-		bbwarn "group $groupname already exists, not re-creating it"
+		bbwarn "${PN}: group $groupname already exists, not re-creating it"
 	fi
 }
 

@@ -42,7 +42,7 @@ perform_useradd () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing useradd with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing useradd with [$opts] and $retries times of retry"
 	local username=`echo "$opts" | awk '{ print $NF }'`
 	local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
 	if test "x$user_exists" = "x"; then

@@ -51,18 +51,18 @@ perform_useradd () {
 		       eval $PSEUDO useradd $opts || true
 		       user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
 		       if test "x$user_exists" = "x"; then
-			       bbwarn "useradd command did not succeed. Retrying..."
+			       bbwarn "${PN}: useradd command did not succeed. Retrying..."
 		       else
 			       break
 		       fi
 		       count=`expr $count + 1`
 		       if test $count = $retries; then
-				bbfatal "Tried running useradd command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running useradd command $retries times without success, giving up"
 		       fi
 		       sleep $count
 	       done
 	else
-		bbwarn "user $username already exists, not re-creating it"
+		bbwarn "${PN}: user $username already exists, not re-creating it"
 	fi
 }
 

@@ -70,10 +70,10 @@ perform_groupmems () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing groupmems with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing groupmems with [$opts] and $retries times of retry"
 	local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'`
 	local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'`
-	bbnote "Running groupmems command with group $groupname and user $username"
+	bbnote "${PN}: Running groupmems command with group $groupname and user $username"
 	# groupmems fails if /etc/gshadow does not exist
 	local gshadow=""
 	if [ -f $rootdir${sysconfdir}/gshadow ]; then

@@ -89,7 +89,7 @@ perform_groupmems () {
 			eval $PSEUDO groupmems $opts || true
 			mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*" $rootdir/etc/group || true`"
 			if test "x$mem_exists" = "x"; then
-				bbwarn "groupmems command did not succeed. Retrying..."
+				bbwarn "${PN}: groupmems command did not succeed. Retrying..."
 			else
 				break
 			fi

@@ -99,12 +99,12 @@ perform_groupmems () {
 					rm -f $rootdir${sysconfdir}/gshadow
 					rm -f $rootdir${sysconfdir}/gshadow-
 				fi
-				bbfatal "Tried running groupmems command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running groupmems command $retries times without success, giving up"
 			fi
 			sleep $count
 		done
 	else
-		bbwarn "group $groupname already contains $username, not re-adding it"
+		bbwarn "${PN}: group $groupname already contains $username, not re-adding it"
 	fi
 	if test "x$gshadow" = "xno"; then
 		rm -f $rootdir${sysconfdir}/gshadow

@@ -116,7 +116,7 @@ perform_groupdel () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing groupdel with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing groupdel with [$opts] and $retries times of retry"
 	local groupname=`echo "$opts" | awk '{ print $NF }'`
 	local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
 	if test "x$group_exists" != "x"; then

@@ -125,18 +125,18 @@ perform_groupdel () {
 			eval $PSEUDO groupdel $opts || true
 			group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
 			if test "x$group_exists" != "x"; then
-				bbwarn "groupdel command did not succeed. Retrying..."
+				bbwarn "${PN}: groupdel command did not succeed. Retrying..."
 			else
 				break
 			fi
 			count=`expr $count + 1`
 			if test $count = $retries; then
-				bbfatal "Tried running groupdel command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running groupdel command $retries times without success, giving up"
 			fi
 			sleep $count
 		done
 	else
-		bbwarn "group $groupname doesn't exist, not removing it"
+		bbwarn "${PN}: group $groupname doesn't exist, not removing it"
 	fi
 }
 

@@ -144,7 +144,7 @@ perform_userdel () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing userdel with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing userdel with [$opts] and $retries times of retry"
 	local username=`echo "$opts" | awk '{ print $NF }'`
 	local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
 	if test "x$user_exists" != "x"; then

@@ -153,18 +153,18 @@ perform_userdel () {
 		       eval $PSEUDO userdel $opts || true
 		       user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
 		       if test "x$user_exists" != "x"; then
-			       bbwarn "userdel command did not succeed. Retrying..."
+			       bbwarn "${PN}: userdel command did not succeed. Retrying..."
 		       else
 			       break
 		       fi
 		       count=`expr $count + 1`
 		       if test $count = $retries; then
-				bbfatal "Tried running userdel command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running userdel command $retries times without success, giving up"
 		       fi
 		       sleep $count
 	       done
 	else
-		bbwarn "user $username doesn't exist, not removing it"
+		bbwarn "${PN}: user $username doesn't exist, not removing it"
 	fi
 }
 

@@ -175,7 +175,7 @@ perform_groupmod () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing groupmod with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing groupmod with [$opts] and $retries times of retry"
 	local groupname=`echo "$opts" | awk '{ print $NF }'`
 	local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
 	if test "x$group_exists" != "x"; then

@@ -183,18 +183,18 @@ perform_groupmod () {
 		while true; do
 			eval $PSEUDO groupmod $opts
 			if test $? != 0; then
-				bbwarn "groupmod command did not succeed. Retrying..."
+				bbwarn "${PN}: groupmod command did not succeed. Retrying..."
 			else
 				break
 			fi
 			count=`expr $count + 1`
 			if test $count = $retries; then
-				bbfatal "Tried running groupmod command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running groupmod command $retries times without success, giving up"
 			fi
 			sleep $count
 		done
 	else
-		bbwarn "group $groupname doesn't exist, unable to modify it"
+		bbwarn "${PN}: group $groupname doesn't exist, unable to modify it"
 	fi
 	set -e
 }

@@ -205,7 +205,7 @@ perform_usermod () {
 	local rootdir="$1"
 	local opts="$2"
 	local retries="$3"
-	bbnote "Performing usermod with [$opts] and $retries times of retry"
+	bbnote "${PN}: Performing usermod with [$opts] and $retries times of retry"
 	local username=`echo "$opts" | awk '{ print $NF }'`
 	local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`"
 	if test "x$user_exists" != "x"; then

@@ -213,18 +213,18 @@ perform_usermod () {
 	       while true; do
 		       eval $PSEUDO usermod $opts
 		       if test $? != 0; then
-			       bbwarn "usermod command did not succeed. Retrying..."
+			       bbwarn "${PN}: usermod command did not succeed. Retrying..."
 		       else
 			       break
 		       fi
 		       count=`expr $count + 1`
 		       if test $count = $retries; then
-				bbfatal "Tried running usermod command $retries times without success, giving up"
+				bbfatal "${PN}: Tried running usermod command $retries times without success, giving up"
 		       fi
 		       sleep $count
 	       done
 	else
-		bbwarn "user $username doesn't exist, unable to modify it"
+		bbwarn "${PN}: user $username doesn't exist, unable to modify it"
 	fi
 	set -e
 }
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/3 useradd_base.bbclass: do not warn when the user exists

In reply to Robert Yang

Use bbnote rather than bbwarn when the user exists, otherwise we would always get the warnings when rebuild the recipe or build with mulitlib, everything is OK if the user exists, so it should not be a warning.

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/useradd_base.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/useradd_base.bbclass +2 -2
index 7fe83a7..802f3a1 100644
@@ -34,7 +34,7 @@ perform_groupadd () {
                         sleep $count
 		done
 	else
-		bbwarn "${PN}: group $groupname already exists, not re-creating it"
+		bbnote "${PN}: group $groupname already exists, not re-creating it"
 	fi
 }
 

@@ -62,7 +62,7 @@ perform_useradd () {
 		       sleep $count
 	       done
 	else
-		bbwarn "${PN}: user $username already exists, not re-creating it"
+		bbnote "${PN}: user $username already exists, not re-creating it"
 	fi
 }
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/3 builder: fix USERADD_PARAM

In reply to Robert Yang

When build lib32-builder, it would create the user lib32-builder which was incorrect.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-graphics/builder/builder_0.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/builder/builder_0.1.bb +1 -1
index 78d41e5..d87d0e9 100644
@@ -21,7 +21,7 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --create-home \
                        --groups video,tty,audio \
                        --password ${BUILDER_PASSWORD} \
-                       --user-group ${PN}"
+                       --user-group builder"
 
 do_install () {
 	install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
Signature · 1 line
1.7.9.5
author
#4 lore raw

Re: [PATCH 3/3] builder: fix USERADD_PARAM

Hello,

I updated this patch a little, we also need update the chown command:

git://git.openembedded.org/openembedded-core-contrib rbt/useradd

meta/recipes-graphics/builder/builder_0.1.bb +2 -2
index 78d41e5..bb729fc 100644
@@ -21,13 +21,13 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --create-home \
                        --groups video,tty,audio \
                        --password ${BUILDER_PASSWORD} \
-                       --user-group ${PN}"
+                       --user-group builder"
 
 do_install () {
        install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
        install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/
 
-       chown  ${PN}.${PN} ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
+       chown  builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
         install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x
 }

// Robert

Quoted 22 lines · Robert Yang

When build lib32-builder, it would create the user lib32-builder which was incorrect.

Signed-off-by Robert Yang <[email protected]>
---
  meta/recipes-graphics/builder/builder_0.1.bb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/builder/builder_0.1.bb +1 -1
index 78d41e5..d87d0e9 100644
@@ -21,7 +21,7 @@ USERADD_PACKAGES = "${PN}"
  USERADD_PARAM_${PN} = "--system --create-home \
                         --groups video,tty,audio \
                         --password ${BUILDER_PASSWORD} \
-                       --user-group ${PN}"
+                       --user-group builder"
 
  do_install () {
  	install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
#5 lore raw

Re: [PATCH 3/3] builder: fix USERADD_PARAM

Quoted 15 lines · Robert Yang

Hello,

I updated this patch a little, we also need update the chown command:

git://git.openembedded.org/openembedded-core-contrib rbt/useradd

meta/recipes-graphics/builder/builder_0.1.bb +0 -0
index 78d41e5..bb729fc 100644

meta/recipes-graphics/builder/builder_0.1.bb USERADD_PACKAGES = "${PN}" · line 24

Quoted 5 lines
meta/recipes-graphics/builder/builder_0.1.bb +1 -1
@@ -21,13 +21,13 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --create-home \
                       --groups video,tty,audio \
                       --password ${BUILDER_PASSWORD} \
-                       --user-group ${PN}"
+                       --user-group builder”

you could use BPN

Quoted 40 lines
meta/recipes-graphics/builder/builder_0.1.bb +1 -1
 do_install () {
       install -d -m 755 ${D}${sysconfdir}/mini_x/session.d
       install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/
 
-       chown  ${PN}.${PN} ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
+       chown  builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh
        install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x
 }
 
 // Robert
Quoted 14 lines · Robert Yang

When build lib32-builder, it would create the user lib32-builder which was incorrect.

Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-graphics/builder/builder_0.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/builder/builder_0.1.bb +0 -0
index 78d41e5..d87d0e9 100644

meta/recipes-graphics/builder/builder_0.1.bb USERADD_PACKAGES = "${PN}" · line 27

Quoted 8 lines
meta/recipes-graphics/builder/builder_0.1.bb +1 -1
@@ -21,7 +21,7 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --create-home \
                        --groups video,tty,audio \
                        --password ${BUILDER_PASSWORD} \
-                       --user-group ${PN}"
+                       --user-group builder"
 
 do_install () {
 	install -d -m 755 ${D}${sysconfdir}/mini_x/session.d

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core