diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-05 00:38:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-05-05 00:38:03 +0000 |
| commit | 71fba0a7a9467d4c3ad3de9a82987215f224e965 (patch) | |
| tree | e3c3e7216f4b434316393f0b7aae8c47ca36e86f /distrib/miniroot | |
| parent | 31ea24b4111b4bd536faab13252cbf473389d513 (diff) | |
spaces to tabs
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 16 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 2ff1cafba1f..2e7c47fe17b 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sh,v 1.181 2009/05/03 20:20:38 krw Exp $ +# $OpenBSD: install.sh,v 1.182 2009/05/05 00:38:02 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 @@ -234,7 +234,7 @@ __EOT [[ $_mp == / ]] && _OPT=$MDROOTFSOPT newfs -q $_OPT /dev/r$_pp # N.B.: '!' is lexically < '/'. That is required for correct - # sorting of mount points. + # sorting of mount points. _mount_points[$_i]="$_mp!$_pp" : $(( _i += 1 )) done <$FILESYSTEMS @@ -325,10 +325,10 @@ sed -e "/^console.*on.*secure.*$/s/std\.[0-9]*/std.$(stty speed)/" \ mv /tmp/ttys /mnt/etc/ttys while :; do - askpassword root - _rootpass="$_password" - [[ -n "$_password" ]] && break - echo "The root password must be set." + askpassword root + _rootpass="$_password" + [[ -n "$_password" ]] && break + echo "The root password must be set." done questions @@ -381,8 +381,8 @@ chmod 600 host.random >/dev/null 2>&1 ) echo "done." if [[ -n "$_rootpass" ]]; then - _encr=`/mnt/usr/bin/encrypt -b 8 -- "$_rootpass"` - echo "1,s@^root::@root:${_encr}:@ + _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 fi diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 0aa2719a58f..fbbcf6a014c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.520 2009/05/04 22:07:28 deraadt Exp $ +# $OpenBSD: install.sub,v 1.521 2009/05/05 00:37:09 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback @@ -1050,10 +1050,10 @@ __EOT rm -f /tmp/h case $_f in *.tgz) ftp $FTPOPTS -o - -m "$_src/$_f" | \ - $shacmd | tar zxphf - -C /mnt + $shacmd | tar zxphf - -C /mnt ;; *) ftp $FTPOPTS -o - -m "$_src/$_f" | \ - $shacmd > "/mnt/$_f" + $shacmd > "/mnt/$_f" ;; esac if [ $? -ne 0 ]; then @@ -1468,7 +1468,7 @@ install_sets() { # Create a skeletal but useful /etc/fstab from /tmp/fstab by stripping all # comment lines and dropping all filesystems which # -# 1) can't be mounted (no mount_* command is found), +# 1) can't be mounted (no mount_* command is found), # 2) have 'xx' in the option field (usually /altroot), # 3) have 'noauto' in the option field, # 4) are nfs (since name resolution may not be present), |