summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2010-10-30 22:48:03 +0000
committerderaadt <deraadt@openbsd.org>2010-10-30 22:48:03 +0000
commit2acf0f1e20168095fff2f32c3e8bdbd32ae03659 (patch)
tree6bc6f09ee84c0d6531c5489cf4fc12aa39df109f
parenttweak gpio pins of julia cards to select the correct multiplier for (diff)
downloadwireguard-openbsd-2acf0f1e20168095fff2f32c3e8bdbd32ae03659.tar.xz
wireguard-openbsd-2acf0f1e20168095fff2f32c3e8bdbd32ae03659.zip
for the user, create a matching group and put the user in there by default; ok halex guenther
-rw-r--r--distrib/miniroot/install.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 5c930199f23..2a9eb2d1244 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.209 2010/10/29 07:43:09 deraadt Exp $
+# $OpenBSD: install.sh,v 1.210 2010/10/30 22:48:03 deraadt Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -286,15 +286,16 @@ apply
if [[ -n $user ]]; then
_encr="*"
[[ -n "$userpass" ]] && _encr=`/mnt/usr/bin/encrypt -b 8 -- "$userpass"`
- userline="${user}:${_encr}:1000:10:staff:0:0:${username}:/home/${user}:/bin/ksh"
- echo "$userline" >> /mnt/etc/master.passwd
+ uline="${user}:${_encr}:1000:1000:staff:0:0:${username}:/home/${user}:/bin/ksh"
+ echo "$uline" >> /mnt/etc/master.passwd
+ echo "${user}:*:1000:" >> /mnt/etc/group
mkdir -p /mnt/home/$user
(cd /mnt/etc/skel; cp -pR . /mnt/home/$user)
( umask 077 &&
sed "s,^To: root\$,To: ${username} <${user}>," \
/mnt/var/mail/root > /mnt/var/mail/$user )
- chown -R 1000.10 /mnt/home/$user /mnt/var/mail/$user
+ chown -R 1000:1000 /mnt/home/$user /mnt/var/mail/$user
echo "1,s@wheel:.:0:root\$@wheel:\*:0:root,${user}@
w
q" | /mnt/bin/ed /mnt/etc/group 2>/dev/null