summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2002-12-14 15:33:36 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2002-12-14 15:33:36 +0000
commit105d8a0505291bafa07dfbf2c37838b0a47ba2fa (patch)
tree87fcee55b807ebbd3a8b93842d07f36b66d6d3b4
parent31532cee75f05163575b5ac99ccc844c2c853216 (diff)
Expunge some trailing whitespace.
From David Krause.
-rw-r--r--distrib/i386/common/install.md4
-rw-r--r--distrib/miniroot/install.sh6
-rw-r--r--distrib/miniroot/install.sub24
-rw-r--r--distrib/notes/packages6
4 files changed, 20 insertions, 20 deletions
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index 2d4b7b6fbc9..cff84f8008a 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.15 2002/12/08 20:53:14 krw Exp $
+# $OpenBSD: install.md,v 1.16 2002/12/14 15:33:34 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@ md_prep_disklabel()
You will now create an OpenBSD disklabel inside the OpenBSD MBR
partition. The disklabel defines how OpenBSD splits up the MBR partition
-into OpenBSD partitions in which filesystems and swap space are created.
+into OpenBSD partitions in which filesystems and swap space are created.
The offsets used in the disklabel are ABSOLUTE, i.e. relative to the
start of the disk, NOT the start of the OpenBSD MBR partition.
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index d63b1314a33..a9b2afff318 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sh,v 1.128 2002/12/08 20:24:56 krw Exp $
+# $OpenBSD: install.sh,v 1.129 2002/12/14 15:33:34 krw Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -387,8 +387,8 @@ hostname > myname
# Add FQDN to /tmp/hosts entries, changing lines of the form '1.2.3.4 hostname'
# to '1.2.3.4 hostname.$FQDN hostname'. Leave untouched any lines containing
# domain information or aliases. The user added those manually.
-_dn=$(get_fqdn)
-while read _addr _hn _aliases; do
+_dn=$(get_fqdn)
+while read _addr _hn _aliases; do
if [[ -n $_aliases || $_hn != ${_hn%%.*} || -z $_dn ]]; then
echo "$_addr $_hn $_aliases"
else
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 30528ba1286..4d4e9c41629 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.284 2002/12/08 20:24:56 krw Exp $
+# $OpenBSD: install.sub,v 1.285 2002/12/14 15:33:35 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -540,7 +540,7 @@ inet_info () {
# no IP address or 0.0.0.0 assigned to $1.
#
# $1 == interface
-# $2 == hostname (optional).
+# $2 == hostname (optional).
dhcp_request () {
local _ifs=$1 _hostname=$2
@@ -552,7 +552,7 @@ dhcp_request () {
else
echo "Issuing free-roaming DHCP request for $_ifs."
fi
-
+
cat >> /etc/dhclient.conf << __EOT
request subnet-mask,
broadcast-address,
@@ -561,22 +561,22 @@ request subnet-mask,
domain-name-servers,
host-name;
__EOT
-
+
cat >> /etc/resolv.conf.tail << __EOT
lookup file bind
__EOT
-
+
kill_dhclient
dhclient -1 $_ifs
-
+
set -- $(inet_info $_ifs)
-
+
if [[ $1 == UP && $2 == "0.0.0.0" ]]; then
ifconfig $_ifs delete down
rm /etc/dhclient.conf /etc/resolv.conf.tail
return 1
fi
-
+
# Move configuration files to where they will be copied to the
# installed system. Overwrites configuration information from last
# successful dhcp attempt.
@@ -618,7 +618,7 @@ __EOT
;;
esac
fi
-
+
# Get address and mask.
_prompt="IP address for ${_ifs}?"
[[ -x /sbin/dhclient ]] && _prompt="$_prompt (or 'dhcp')"
@@ -647,7 +647,7 @@ __EOT
addhostent $_addr $_name
return 0
}
-
+
# Returns true if $1 contains only alphanumerics
isalphanumeric() {
local _n
@@ -1710,7 +1710,7 @@ donetconfig() {
ask "IP address of default route? (or 'none')" "${resp:=none}"
[[ $resp == none ]] && break
route add default $resp || { resp= ; continue; }
- # Save default route if DHCP wasn't used.
+ # Save default route if DHCP wasn't used.
[ -f /tmp/dhclient.conf ] || echo $resp > /tmp/mygate
break
done
@@ -1835,7 +1835,7 @@ if [ -z "$EDITOR" ] ; then
export EDITOR
fi
-# umount all filesystems, just in case we are re-running install or upgrade.
+# umount all filesystems, just in case we are re-running install or upgrade.
[[ -f /etc/fstab ]] && umount -av 1>/dev/null 2>&1
umount -v /mnt 1>/dev/null 2>&1
diff --git a/distrib/notes/packages b/distrib/notes/packages
index bcfae05e468..6a3a5d5c1ca 100644
--- a/distrib/notes/packages
+++ b/distrib/notes/packages
@@ -1,4 +1,4 @@
-dnl $OpenBSD: packages,v 1.26 2002/10/02 07:17:08 pvalchev Exp $
+dnl $OpenBSD: packages,v 1.27 2002/12/14 15:33:35 krw Exp $
As complete as your OpenBSD system is, you may want to add any of several
excellent third party software applications. There are several ways to do
this. You can:
@@ -46,7 +46,7 @@ Installing applications from the CD-ROM package collection:
# pkg_add /cdrom/OSREV/packages/MACHINE_ARCH/<package-name>
# <add more packages if desired>
# umount /cdrom
-
+
Package names are usually the application name and version
with .tgz appended, e.g. emacs-20.7.tgz
@@ -995,7 +995,7 @@ Installing applications from the ftp.openbsd.org package collection:
zsh-4.0.6-static.tgz zsh-4.0.6.tgz
zsh-4.1.0dev5-static.tgz zsh-4.1.0dev5.tgz
zsh-zftp-4.0.6.tgz zsh-zftp-4.1.0dev5.tgz
- zsnes-1.36.tgz
+ zsnes-1.36.tgz
Note: these packages may not exist for all architectures; other
packages may be added. Some packages are only available via