aboutsummaryrefslogtreecommitdiff
path: root/rcynic/installation-scripts/linux
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2011-02-12 01:42:29 +0000
committerMichael Elkins <melkins@tislabs.com>2011-02-12 01:42:29 +0000
commit06f698b5bf00c3eac99934343d7d0f2e8ea8c257 (patch)
tree5a153b73408e46d5847a347fc88caa24316cc6ef /rcynic/installation-scripts/linux
parent6761e622d51199d725fbaaf6ac148b9c2d721bf1 (diff)
quick fix to use -n argument to useradd when executed on CentOS
svn path=/rcynic/installation-scripts/linux/install.sh.in; revision=3675
Diffstat (limited to 'rcynic/installation-scripts/linux')
-rw-r--r--rcynic/installation-scripts/linux/install.sh.in12
1 files changed, 11 insertions, 1 deletions
diff --git a/rcynic/installation-scripts/linux/install.sh.in b/rcynic/installation-scripts/linux/install.sh.in
index ca3fda61..35e177d5 100644
--- a/rcynic/installation-scripts/linux/install.sh.in
+++ b/rcynic/installation-scripts/linux/install.sh.in
@@ -27,10 +27,20 @@ else
exit 1
fi
+# The adduser program on CentOS 5.x uses the -n flag instead of -N to
+# avoid creating the associated group.
+nogroup='-N'
+if test -f /etc/redhat-release; then
+ cat /etc/redhat-release | read vendor release version
+ if test $vendor = CentOS; then
+ nogroup='-n'
+ fi
+fi
+
if ${AWK} -F: -v jailuser="${jailuser}" 'BEGIN {status = 1} $1 == jailuser {status = 0} END {exit status}' /etc/passwd
then
echo "You already have a user \"${jailuser}\", so I will use it."
-elif /usr/sbin/useradd -g ${jailgroup} -M -N -d "${jaildir}" -s /sbin/nologin -c "RPKI validation system" ${jailuser}
+elif /usr/sbin/useradd -g ${jailgroup} -M $nogroup -d "${jaildir}" -s /sbin/nologin -c "RPKI validation system" ${jailuser}
then
echo "Added user \"${jailuser}\"."
else