mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from marineam/group

Browse Source 
fix(make_chroot): Fix support for new users with existing groups.
This commit is contained in:
Greg Kroah-Hartman 2013-09-06 12:13:12 -07:00
commit 772994d916
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_lib/make_chroot.sh
View File

@ -150,12 +150,20 @@ init_users () {
group_name=$(getent group "${SUDO_GID}" | cut -d: -f1) group_name=$(getent group "${SUDO_GID}" | cut -d: -f1)
[[ -n "${group_name}" ]] || die "Looking up gid $SUDO_GID failed." [[ -n "${group_name}" ]] || die "Looking up gid $SUDO_GID failed."
if grep -q "^${group_name}:[^:]*:${SUDO_GID}:" "${FLAGS_chroot}/etc/group"
then
true # group/gid exists, don't need to add it
elif grep -q "^${group_name}:" "${FLAGS_chroot}/etc/group"; then
die "Group ${group_name} exists in chroot with different GID"
else
bare_chroot groupadd -o -g "${SUDO_GID}" "${group_name}"
fi
# We need the UID to match the host user's. This can conflict with # We need the UID to match the host user's. This can conflict with
# a particular chroot UID. At the same time, the added user has to # a particular chroot UID. At the same time, the added user has to
# be a primary user for the given UID for sudo to work, which is # be a primary user for the given UID for sudo to work, which is
# determined by the order in /etc/passwd. Let's put ourselves on top # determined by the order in /etc/passwd. Let's put ourselves on top
# of the file. # of the file.
bare_chroot groupadd -o -g "${SUDO_GID}" "${group_name}"
bare_chroot useradd -o \ bare_chroot useradd -o \
-G "${DEFGROUPS}" -g "${SUDO_GID}" -u "${SUDO_UID}" \ -G "${DEFGROUPS}" -g "${SUDO_GID}" -u "${SUDO_UID}" \
-s /bin/bash -m -c "${full_name}" "${SUDO_USER}" -s /bin/bash -m -c "${full_name}" "${SUDO_USER}"