diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-11-06 10:50:43 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 16:53:04 +0000 |
| commit | 05f9c15abb0705cd9f8aa28bfb3016485730b643 (patch) | |
| tree | 39023ab1ba951ddc2fb0160a936b58dcc0c32922 /meta | |
| parent | 6c212e229ba1be0c536e7c36ebe2a3e8b2ef84b4 (diff) | |
| download | openembedded-core-05f9c15abb0705cd9f8aa28bfb3016485730b643.tar.gz openembedded-core-05f9c15abb0705cd9f8aa28bfb3016485730b643.tar.bz2 openembedded-core-05f9c15abb0705cd9f8aa28bfb3016485730b643.zip | |
extrausers.bbclass: avoid infinite loop
Avoid infinite loop if the last record in EXTRA_USRES_PARAMS doesn't
end with a semicolon.
It's possible the the users will write configurations like below.
INHERIT += "extrausers"
EXTRA_USERS_PARAMS = "useradd tester; useradd developer"
In such situation, the do_rootfs task will enter an infinite loop.
An infinite loop is never acceptable.
This patch fixes the above problem.
(From OE-Core master rev: bf4fb345a9db306fa4c7211b7e6795334a649dd5)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/extrausers.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass index 8670a2a85a..faf57b108e 100644 --- a/meta/classes/extrausers.bbclass +++ b/meta/classes/extrausers.bbclass @@ -54,6 +54,10 @@ set_user_group () { bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd" ;; esac + # Avoid infinite loop if the last parameter doesn't end with ';' + if [ "$setting" = "$remaining" ]; then + break + fi # iterate to the next setting setting=`echo $remaining | cut -d ';' -f1` remaining=`echo $remaining | cut -d ';' -f2-` |