From: Johan Oudinet <johan.oudinet@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] support/mkusers: Preserve group members
Date: Mon, 3 Sep 2018 15:11:16 +0200 [thread overview]
Message-ID: <20180903131116.5404-1-johan.oudinet@gmail.com> (raw)
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@gmail.com>
---
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
next reply other threads:[~2018-09-03 13:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 13:11 Johan Oudinet [this message]
2018-09-10 15:22 ` [Buildroot] [PATCH] support/mkusers: Preserve group members Yann E. MORIN
2018-09-10 15:24 ` Yann E. MORIN
2018-09-12 19:33 ` Thomas Petazzoni
2018-10-01 19:21 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180903131116.5404-1-johan.oudinet@gmail.com \
--to=johan.oudinet@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.