summaryrefslogtreecommitdiffstats
path: root/meta/classes/extrausers.bbclass
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2013-11-06 02:50:43 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-06 11:02:26 (GMT)
commit5810d54756159f181e0e95122bfbcca451fe7665 (patch)
tree32b3df2b88eaa455bc8a796231a8863d1a0c4404 /meta/classes/extrausers.bbclass
parent3e6b57fcfea93fbefd746ba056410409b35c5523 (diff)
downloadpoky-5810d54756159f181e0e95122bfbcca451fe7665.tar.gz
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 rev: bf4fb345a9db306fa4c7211b7e6795334a649dd5) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/extrausers.bbclass')
-rw-r--r--meta/classes/extrausers.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass
index 8670a2a..faf57b1 100644
--- a/meta/classes/extrausers.bbclass
+++ b/meta/classes/extrausers.bbclass
@@ -54,6 +54,10 @@ set_user_group () {
54 bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd" 54 bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd"
55 ;; 55 ;;
56 esac 56 esac
57 # Avoid infinite loop if the last parameter doesn't end with ';'
58 if [ "$setting" = "$remaining" ]; then
59 break
60 fi
57 # iterate to the next setting 61 # iterate to the next setting
58 setting=`echo $remaining | cut -d ';' -f1` 62 setting=`echo $remaining | cut -d ';' -f1`
59 remaining=`echo $remaining | cut -d ';' -f2-` 63 remaining=`echo $remaining | cut -d ';' -f2-`