summaryrefslogtreecommitdiffstats
path: root/support/scripts
diff options
context:
space:
mode:
authorJens Maus <mail@jens-maus.de>2017-06-12 15:35:54 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-06-24 17:49:48 +0200
commit82f64203a8f017d50b754323194694374f92add5 (patch)
tree53004f545d34bba015429f4dcf3b64b89c21f78c /support/scripts
parentcb3945103837259863b1863b57f9a8c9ed74e89d (diff)
downloadbuildroot-82f64203a8f017d50b754323194694374f92add5.tar.gz
buildroot-82f64203a8f017d50b754323194694374f92add5.zip
support/scripts: allow /etc/shadow to be symlinked
This commit fixes a problem where it was not possible to replace /etc/shadow with a symlink to a e.g. a user partition where the shadow file is placed. This is required, e.g. for systems where the rootfs is mounted read-only but users should still be able to be added. Thus, if within an filesystem overlay setup a user tries to replace /etc/shadow with a symlink to the real file on a user partition a buildroot build stops with an error message because sed is called on the symlink instead of following the symlink. This commit fixes this shortcoming. Signed-off-by: Jens Maus <mail@jens-maus.de> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/scripts')
-rwxr-xr-xsupport/scripts/mkusers9
1 files changed, 5 insertions, 4 deletions
diff --git a/support/scripts/mkusers b/support/scripts/mkusers
index 2ac76f9863..5bbec3e10f 100755
--- a/support/scripts/mkusers
+++ b/support/scripts/mkusers
@@ -219,12 +219,12 @@ add_one_group() {
fi
# Remove any previous instance of this group, and re-add the new one
- sed -i -e '/^'"${group}"':.*/d;' "${GROUP}"
+ sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GROUP}"
printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}"
# Ditto for /etc/gshadow if it exists
if [ -f "${GSHADOW}" ]; then
- sed -i -e '/^'"${group}"':.*/d;' "${GSHADOW}"
+ sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GSHADOW}"
printf "%s:*::\n" "${group}" >>"${GSHADOW}"
fi
}
@@ -263,7 +263,8 @@ add_user_to_group() {
for _f in "${GROUP}" "${GSHADOW}"; do
[ -f "${_f}" ] || continue
- sed -r -i -e 's/^('"${group}"':.*:)(([^:]+,)?)'"${username}"'(,[^:]+*)?$/\1\2\4/;' \
+ sed -r -i --follow-symlinks \
+ -e 's/^('"${group}"':.*:)(([^:]+,)?)'"${username}"'(,[^:]+*)?$/\1\2\4/;' \
-e 's/^('"${group}"':.*)$/\1,'"${username}"'/;' \
-e 's/,+/,/' \
-e 's/:,/:/' \
@@ -303,7 +304,7 @@ add_one_user() {
# Remove any previous instance of this user
for _f in "${PASSWD}" "${SHADOW}"; do
- sed -r -i -e '/^'"${username}"':.*/d;' "${_f}"
+ sed -r -i --follow-symlinks -e '/^'"${username}"':.*/d;' "${_f}"
done
_gid="$( get_gid "${group}" )"
OpenPOWER on IntegriCloud