diff options
| author |   deraadt <deraadt@openbsd.org> | 2004-07-18 01:12:32 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2004-07-18 01:12:32 +0000 |
| commit | d47e4d27c2d0932f964fd5deb9e62b49aed84528 (patch) | |
| tree | 2282290ce9c0ed09e320651b808961d05da4751a | |
| parent | For set installation via URL or NFS, assume the network has been configured (diff) | |
| download | wireguard-openbsd-d47e4d27c2d0932f964fd5deb9e62b49aed84528.tar.xz wireguard-openbsd-d47e4d27c2d0932f964fd5deb9e62b49aed84528.zip | |
spaces
| -rw-r--r-- | distrib/cats/ramdisk/install.md | 6 | ||||
| -rw-r--r-- | distrib/macppc/ramdisk/install.md | 6 | ||||
| -rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/distrib/cats/ramdisk/install.md b/distrib/cats/ramdisk/install.md index a61e46c68af..e33ed611cbb 100644 --- a/distrib/cats/ramdisk/install.md +++ b/distrib/cats/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.4 2004/02/11 23:32:30 drahn Exp $ +# $OpenBSD: install.md,v 1.5 2004/07/18 01:14:04 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -110,7 +110,7 @@ __EOT return fi - + # Manual MBR setup. The user is basically on their own. Give a few # hints and let the user rip. cat << __EOT @@ -156,7 +156,7 @@ disklabel -c ${_disk} __EOT - + } md_prep_disklabel() { diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md index fdcdde307b5..ca13d49803c 100644 --- a/distrib/macppc/ramdisk/install.md +++ b/distrib/macppc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.25 2004/05/24 15:47:00 tom Exp $ +# $OpenBSD: install.md,v 1.26 2004/07/18 01:14:04 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -128,7 +128,7 @@ __EOT return fi - + # Manual MBR setup. The user is basically on their own. Give a few # hints and let the user rip. cat << __EOT @@ -176,7 +176,7 @@ You must modify an existing partition to be of type "OpenBSD" and have the name MacOS tools before attempting to install OpenBSD. __EOT - + pdisk /dev/${_disk}c } diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 053101f1c29..c9f76a0cfe6 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.145 2004/07/04 22:30:25 krw Exp $ +# $OpenBSD: install.sh,v 1.146 2004/07/18 01:12:32 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -232,7 +232,7 @@ __EOT _i=0 unset _partitions _mount_points while read _pp _mp; do - _OPT= + _OPT= [[ $_mp == / ]] && _OPT=$MDROOTFSOPT newfs -q $_OPT /dev/r$_pp diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index d2ac8d222e2..27ade286e94 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.347 2004/07/18 00:46:14 krw Exp $ +# $OpenBSD: install.sub,v 1.348 2004/07/18 01:12:32 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback @@ -510,7 +510,7 @@ configure_ifs() { [[ $resp == done ]] && break _ifs=$resp - _hn=/tmp/hostname.$_ifs + _hn=/tmp/hostname.$_ifs # Get symbolic name - will be used in DHCP requests. ask "Symbolic (host) name for $_ifs?" "$(hostname -s)" @@ -612,11 +612,11 @@ v4_config() { if [[ -n $2 ]]; then ifconfig $_ifs inet $2 delete [[ $2 != "0.0.0.0" ]] && { _addr=$2; _mask=$3; } - fi + fi [[ -x /sbin/dhclient ]] && _prompt=" or 'dhcp'" _prompt="IPv4 address for $_ifs? (or 'none'$_prompt)" - + ask_until "$_prompt" "$_addr" case $resp in none) ;; |