diff options
| author | Maxin B. John <maxin.john@intel.com> | 2016-08-16 14:12:03 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 15:27:04 +0100 |
| commit | 17e4586d6ec991e4b40105c9be0e1ce848c44799 (patch) | |
| tree | 7d344a1f523b8da6ef89a5b1c5d758443600caec /meta/classes | |
| parent | 6175bd0930e726a81facc394b39956b1aa58e674 (diff) | |
| download | poky-17e4586d6ec991e4b40105c9be0e1ce848c44799.tar.gz | |
useradd_base: avoid unintended expansion for useradd parameters
Now, useradd dollar sign requires three prepending backslash characters to
avoid unintended expansion. It used to be just one prepending backslash
character before Krogoth. Restore that behaviour.
[YOCTO #10062]
(From OE-Core rev: 9e43a73c7ad576666d53c8c9e0283bc6bb9087a8)
(From OE-Core rev: 42a0d59d5923fb43882d8e60f6973b45b263e262)
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/useradd_base.bbclass | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index 0d81accd1a..f4dc7134cb 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass | |||
| @@ -17,7 +17,6 @@ perform_groupadd () { | |||
| 17 | local groupname=`echo "$opts" | awk '{ print $NF }'` | 17 | local groupname=`echo "$opts" | awk '{ print $NF }'` |
| 18 | local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" | 18 | local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" |
| 19 | if test "x$group_exists" = "x"; then | 19 | if test "x$group_exists" = "x"; then |
| 20 | opts=`echo $opts | sed s/\'/\"/g` | ||
| 21 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupadd \$opts\" || true | 20 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupadd \$opts\" || true |
| 22 | group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" | 21 | group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" |
| 23 | if test "x$group_exists" = "x"; then | 22 | if test "x$group_exists" = "x"; then |
| @@ -35,7 +34,6 @@ perform_useradd () { | |||
| 35 | local username=`echo "$opts" | awk '{ print $NF }'` | 34 | local username=`echo "$opts" | awk '{ print $NF }'` |
| 36 | local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" | 35 | local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" |
| 37 | if test "x$user_exists" = "x"; then | 36 | if test "x$user_exists" = "x"; then |
| 38 | opts=`echo $opts | sed s/\'/\"/g` | ||
| 39 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO useradd \$opts\" || true | 37 | eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO useradd \$opts\" || true |
| 40 | user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" | 38 | user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" |
| 41 | if test "x$user_exists" = "x"; then | 39 | if test "x$user_exists" = "x"; then |