[Buildroot] [PATCH] support/mkusers: Preserve group members
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Sep 10 15:22:00 UTC 2018
Johan, All,
On 2018-09-03 15:11 +0200, Johan Oudinet spake thusly:
> When the function add_one_group is called on an existing group,
> make sure the members of this group are not removed in the process of
> deleting then re-adding the group.
>
> Signed-off-by: Johan Oudinet <johan.oudinet at gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> ---
> support/scripts/mkusers | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/support/scripts/mkusers b/support/scripts/mkusers
> index 5bbec3e10f..ec75c02dac 100755
> --- a/support/scripts/mkusers
> +++ b/support/scripts/mkusers
> @@ -75,6 +75,14 @@ get_gid() {
> '$1 == group { printf( "%d\n", $3 ); }' "${GROUP}"
> }
>
> +#----------------------------------------------------------------------------
> +get_members() {
> + local group="${1}"
> +
> + awk -F: -v group="${group}" \
> + '$1 == group { printf( "%s\n", $4 ); }' "${GROUP}"
> +}
> +
> #----------------------------------------------------------------------------
> get_username() {
> local uid="${1}"
> @@ -211,16 +219,17 @@ generate_gid() {
> add_one_group() {
> local group="${1}"
> local gid="${2}"
> - local _f
> + local members
>
> # Generate a new GID if needed
> if [ ${gid} -eq -1 ]; then
> gid="$( generate_gid "${group}" )"
> fi
>
> + members=$(get_members "$group")
> # Remove any previous instance of this group, and re-add the new one
> sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GROUP}"
> - printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}"
> + printf "%s:x:%d:%s\n" "${group}" "${gid}" "$members" >>"${GROUP}"
>
> # Ditto for /etc/gshadow if it exists
> if [ -f "${GSHADOW}" ]; then
> --
> 2.17.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list