summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-06 08:35:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-05-06 08:35:25 +0000
commit679226da97a524ce85ae2eee22b21013ab6d6c4e (patch)
treed3e5056dd54fce863beaf94cc2a84ceabea7f6ae
parent7a9e83205bff4eb9c8380cc2fe9bafef18a35a48 (diff)
whoa, we were assuming that $_password was still the user password. we
got lucky.
-rw-r--r--distrib/miniroot/install.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 82b390de77a..c97ec77df46 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.184 2009/05/06 01:29:48 deraadt Exp $
+# $OpenBSD: install.sh,v 1.185 2009/05/06 08:35:24 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
@@ -281,7 +281,7 @@ apply
if [[ -n $user ]]; then
_encr="*"
- [[ -n "$_password" ]] && _encr=`/mnt/usr/bin/encrypt -b 8 -- "$_password"`
+ [[ -n "$userpass" ]] && _encr=`/mnt/usr/bin/encrypt -b 8 -- "$userpass"`
userline="${user}:${_encr}:1000:10::0:0:${username}:/home/${user}:/bin/ksh"
echo "$userline" >> /mnt/etc/master.passwd