summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2001-12-04 21:05:06 +0000
committerseb <seb@pkgsrc.org>2001-12-04 21:05:06 +0000
commit1339fe73d0a75a7941fe68379a93be3011a02d71 (patch)
tree306475d844cbff37b9d3c9fbee44602a238c0852 /mk/install
parente5274d39224d7c1d760aee29647e0eb5fa15f920 (diff)
downloadpkgsrc-1339fe73d0a75a7941fe68379a93be3011a02d71.tar.gz
Fix of commands invoking {USER,GROUP}ADD so that '-{u,g}' and '{user,group}id'
are two distinct shell words. Reviewed by Johnny C. Lam.
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/install10
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/install/install b/mk/install/install
index dc9f68f954e..21dc9dcb6ad 100644
--- a/mk/install/install
+++ b/mk/install/install
@@ -1,6 +1,6 @@
# start of install
#
-# $NetBSD: install,v 1.5 2001/11/26 20:37:39 jlam Exp $
+# $NetBSD: install,v 1.6 2001/12/04 21:05:06 seb Exp $
case ${STAGE} in
PRE-INSTALL)
@@ -25,10 +25,10 @@ PRE-INSTALL)
groupid_option=
if [ -n "${groupid}" ]
then
- groupid_option="-g ${groupid}"
+ groupid_option="-g"
fi
${ECHO} "Creating group: ${group}"
- ${GROUPADD} ${groupid_option} "${group}"
+ ${GROUPADD} ${groupid_option} ${groupid} "${group}"
fi
${RM} -f /tmp/grouptest.$$
)
@@ -55,11 +55,11 @@ PRE-INSTALL)
userid_option=
if [ -n "${userid}" ]
then
- userid_option="-u ${userid}"
+ userid_option="-u"
fi
${ECHO} "Creating user: ${user}"
${USERADD} -c "${descr}" \
- ${userid_option} \
+ ${userid_option} ${userid} \
-g "${group}" \
-d "${home}" \
-s "${shell}" \