aboutsummaryrefslogtreecommitdiff
path: root/support/scripts
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-03-29 11:54:43 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-03-29 13:39:25 +0200
commit96a8321a3c3edc8f696e14bbd07556582bb5b133 (patch)
treeb68784e3cbdbba736a99794f3cdfcc02c65a2ded /support/scripts
parentad24d833058e443fdd62c7f409b4c00d5c3f7c0e (diff)
downloadbuildroot-96a8321a3c3edc8f696e14bbd07556582bb5b133.tar.gz
buildroot-96a8321a3c3edc8f696e14bbd07556582bb5b133.tar.bz2
support/mkusers: enhance error messages
The current error messages are a bit terse, and do not provide all the required information. Expand them to provide more context. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Tom Elliott <tommygunsster@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/scripts')
-rwxr-xr-xsupport/scripts/mkusers22
1 files changed, 14 insertions, 8 deletions
diff --git a/support/scripts/mkusers b/support/scripts/mkusers
index b003330ef6..026519e4ee 100755
--- a/support/scripts/mkusers
+++ b/support/scripts/mkusers
@@ -129,47 +129,53 @@ check_user_validity() {
fi
if [ ${gid} -lt -1 -o ${gid} -eq 0 ]; then
- fail "invalid gid '%d'\n" ${gid}
+ fail "invalid gid '%d' for '%s'\n" ${gid} "${username}"
elif [ ${gid} -ne -1 ]; then
# check the gid is not already used for another group
if [ -n "${_group}" -a "${_group}" != "${group}" ]; then
- fail "gid is already used by group '${_group}'\n"
+ fail "gid '%d' for '%s' is already used by group '%s'\n" \
+ ${gid} "${username}" "${_group}"
fi
# check the group does not already exists with another gid
# Need to split the check in two, otherwise '[' complains it
# is missing arguments when _gid is empty
if [ -n "${_gid}" ] && [ ${_gid} -ne ${gid} ]; then
- fail "group already exists with gid '${_gid}'\n"
+ fail "group '%s' for '%s' already exists with gid '%d' (wants '%d')\n" \
+ "${group}" "${username}" ${_gid} ${gid}
fi
# check the user does not already exists with another gid
# Need to split the check in two, otherwise '[' complains it
# is missing arguments when _ugid is empty
if [ -n "${_ugid}" ] && [ ${_ugid} -ne ${gid} ]; then
- fail "user already exists with gid '${_ugid}'\n"
+ fail "user '%s' already exists with gid '%d' (wants '%d')\n" \
+ "${username}" ${_ugid} ${gid}
fi
fi
if [ ${uid} -lt -1 -o ${uid} -eq 0 ]; then
- fail "invalid uid '%d'\n" ${uid}
+ fail "invalid uid '%d' for '%s'\n" ${uid} "${username}"
elif [ ${uid} -ne -1 ]; then
# check the uid is not already used for another user
if [ -n "${_username}" -a "${_username}" != "${username}" ]; then
- fail "uid is already used by user '${_username}'\n"
+ fail "uid '%d' for '%s' already used by user '%s'\n" \
+ ${uid} "${username}" "${_username}"
fi
# check the user does not already exists with another uid
# Need to split the check in two, otherwise '[' complains it
# is missing arguments when _uid is empty
if [ -n "${_uid}" ] && [ ${_uid} -ne ${uid} ]; then
- fail "user already exists with uid '${_uid}'\n"
+ fail "user '%s' already exists with uid '%d' (wants '%d')\n" \
+ "${username}" ${_uid} ${uid}
fi
fi
# check the user does not already exist in another group
if [ -n "${_ugroup}" -a "${_ugroup}" != "${group}" ]; then
- fail "user already exists with group '${_ugroup}'\n"
+ fail "user '%s' already exists with group '%s' (wants '%s')\n" \
+ "${username}" "${_ugroup}" "${group}"
fi
return 0