diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-04-15 18:53:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-04-15 18:53:51 +0000 |
| commit | aa788865e824d1db267347b02e550a9d74aadec7 (patch) | |
| tree | 68638ce5b8e84e7b2275ac1f83957f5556b4accf /distrib/miniroot/install.sh | |
| parent | 4ad2b4ea3722b0da4ec39edee197b31f0cb45770 (diff) | |
Use the dd and ed that are on the media, instead of the one post-install.
Amazing this mistake lurked for so long...
Diffstat (limited to 'distrib/miniroot/install.sh')
| -rw-r--r-- | distrib/miniroot/install.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 0b32a561b8e..2e6c19552a1 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.231 2012/09/28 16:23:25 rpe Exp $ +# $OpenBSD: install.sh,v 1.232 2013/04/15 18:53:50 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 @@ -276,7 +276,7 @@ done) ifconfig -A; hostname) >/mnt/dev/arandom 2>&1 echo -n "done.\nGenerating initial host.random file..." -/mnt/bin/dd if=/mnt/dev/arandom of=/mnt/var/db/host.random \ +dd if=/mnt/dev/arandom of=/mnt/var/db/host.random \ bs=65536 count=1 >/dev/null 2>&1 chmod 600 /mnt/var/db/host.random >/dev/null 2>&1 echo "done." @@ -299,14 +299,14 @@ if [[ -n $user ]]; then 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 +q" | ed /mnt/etc/group 2>/dev/null fi if [[ -n "$_rootpass" ]]; then _encr=$(/mnt/usr/bin/encrypt -b 8 -- "$_rootpass") echo "1,s@^root::@root:${_encr}:@ w -q" | /mnt/bin/ed /mnt/etc/master.passwd 2>/dev/null +q" | ed /mnt/etc/master.passwd 2>/dev/null fi /mnt/usr/sbin/pwd_mkdb -p -d /mnt/etc /etc/master.passwd |