From 9909104c673c9e9388d78d5fbe1ab9c9c421737c Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Wed, 10 Feb 2016 13:32:52 +0100 Subject: classes/useradd: handle whitespace only USERADD/GROUPADD/GROUPMEMS Useradd attempts to add users/groups even when {USERADD,GROUPADD,GROUPMEMS}_PARAM is whitespace only. This scenario is possible when variables and modified using one of +=, =+ operator, yet the content being added is conditional (i.e. may depend on PACKAGECONFIG flags). (From OE-Core rev: 466288d528cce5f9887d765a757af64c9cc6be03) Signed-off-by: Maciej Borzecki Signed-off-by: Richard Purdie --- meta/classes/useradd.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 4577e56f5a..c960656f02 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -50,7 +50,7 @@ fi # Perform group additions first, since user additions may depend # on these groups existing -if test "x$GROUPADD_PARAM" != "x"; then +if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupadd commands..." # Invoke multiple instances of groupadd for parameter lists # separated by ';' @@ -66,7 +66,7 @@ if test "x$GROUPADD_PARAM" != "x"; then done fi -if test "x$USERADD_PARAM" != "x"; then +if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running useradd commands..." # Invoke multiple instances of useradd for parameter lists # separated by ';' @@ -82,7 +82,7 @@ if test "x$USERADD_PARAM" != "x"; then done fi -if test "x$GROUPMEMS_PARAM" != "x"; then +if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then echo "Running groupmems commands..." # Invoke multiple instances of groupmems for parameter lists # separated by ';' -- cgit v1.2.3-54-g00ecf