diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2016-04-08 17:46:26 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:45 +0100 |
commit | fb8e5f903ce341eec1929bf315fa8e3752a4e3a5 (patch) | |
tree | 24c0ee1f947f60decf5e69d72f760e1a17bee795 /meta/classes | |
parent | f737af453d20d98c3e16bb286d92c2b6a317c6c2 (diff) | |
download | poky-fb8e5f903ce341eec1929bf315fa8e3752a4e3a5.tar.gz |
extrausers.bbclass: drop retry count for perform_user/group* calls
Commit 2ebf697b46c42cee8bfa6d2e6087397f8cce385c [useradd_base.bbclass:
replace retry logic with flock] dropped the 3rd (retry) parameter for
these functions. These are simply being ignored now but we should
remove the retry count to avoid confusion.
(From OE-Core rev: 4ec99da681a6cd164ae177554b23c4fdf2194e2a)
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/extrausers.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/extrausers.bbclass b/meta/classes/extrausers.bbclass index faf57b108e..43900f359d 100644 --- a/meta/classes/extrausers.bbclass +++ b/meta/classes/extrausers.bbclass | |||
@@ -33,22 +33,22 @@ set_user_group () { | |||
33 | # this setting is actually a serial process. So we only retry once. | 33 | # this setting is actually a serial process. So we only retry once. |
34 | case $cmd in | 34 | case $cmd in |
35 | useradd) | 35 | useradd) |
36 | perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 36 | perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
37 | ;; | 37 | ;; |
38 | groupadd) | 38 | groupadd) |
39 | perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 39 | perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
40 | ;; | 40 | ;; |
41 | userdel) | 41 | userdel) |
42 | perform_userdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 42 | perform_userdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
43 | ;; | 43 | ;; |
44 | groupdel) | 44 | groupdel) |
45 | perform_groupdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 45 | perform_groupdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
46 | ;; | 46 | ;; |
47 | usermod) | 47 | usermod) |
48 | perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 48 | perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
49 | ;; | 49 | ;; |
50 | groupmod) | 50 | groupmod) |
51 | perform_groupmod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1 | 51 | perform_groupmod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" |
52 | ;; | 52 | ;; |
53 | *) | 53 | *) |
54 | bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd" | 54 | bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd" |