diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-12-14 15:33:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2002-12-14 15:33:36 +0000 |
| commit | 105d8a0505291bafa07dfbf2c37838b0a47ba2fa (patch) | |
| tree | 87fcee55b807ebbd3a8b93842d07f36b66d6d3b4 /distrib/miniroot | |
| parent | 31532cee75f05163575b5ac99ccc844c2c853216 (diff) | |
Expunge some trailing whitespace.
From David Krause.
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 6 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 24 |
2 files changed, 15 insertions, 15 deletions
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 |