mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
f737af453d
commit
fb8e5f903c
@@ -33,22 +33,22 @@ set_user_group () {
|
|||||||
# this setting is actually a serial process. So we only retry once.
|
# this setting is actually a serial process. So we only retry once.
|
||||||
case $cmd in
|
case $cmd in
|
||||||
useradd)
|
useradd)
|
||||||
perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_useradd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
groupadd)
|
groupadd)
|
||||||
perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_groupadd "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
userdel)
|
userdel)
|
||||||
perform_userdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_userdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
groupdel)
|
groupdel)
|
||||||
perform_groupdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_groupdel "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
usermod)
|
usermod)
|
||||||
perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_usermod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
groupmod)
|
groupmod)
|
||||||
perform_groupmod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts" 1
|
perform_groupmod "${IMAGE_ROOTFS}" "-R ${IMAGE_ROOTFS} $opts"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd"
|
bbfatal "Invalid command in EXTRA_USERS_PARAMS: $cmd"
|
||||||
|
|||||||
Reference in New Issue
Block a user