summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2005-03-26 01:40:20 +0000
committerkrw <krw@openbsd.org>2005-03-26 01:40:20 +0000
commit3d4eed1bd119c86563f95da0738a84cb080ae24a (patch)
tree09f69ef02a1a99ac60b90d612d4c59770be85e26
parentall hail Theo and do as He wishes. (diff)
downloadwireguard-openbsd-3d4eed1bd119c86563f95da0738a84cb080ae24a.tar.xz
wireguard-openbsd-3d4eed1bd119c86563f95da0738a84cb080ae24a.zip
Start some delayed cleanup and shrinkage. Today: ': ;' -> ':;' in
while statements.
-rw-r--r--distrib/amd64/common/install.md6
-rw-r--r--distrib/cats/ramdisk/install.md4
-rw-r--r--distrib/i386/common/install.md6
-rw-r--r--distrib/macppc/ramdisk/install.md4
-rw-r--r--distrib/miniroot/install.sh6
-rw-r--r--distrib/miniroot/install.sub20
6 files changed, 23 insertions, 23 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md
index 9329a292b60..aa966b4b014 100644
--- a/distrib/amd64/common/install.md
+++ b/distrib/amd64/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.2 2004/08/12 23:46:08 krw Exp $
+# $OpenBSD: install.md,v 1.3 2005/03/26 01:40:20 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ md_set_term() {
ask_yn "Do you wish to select a keyboard encoding table?"
[[ $resp == n ]] && return
- while : ; do
+ while :; do
ask "Select your keyboard type: (P)C-AT/XT, (U)SB or 'done'" P
case $resp in
P*|p*) _tables="be br de dk es fr it jp lt no pt ru sf sg sv ua uk us"
@@ -69,7 +69,7 @@ md_set_term() {
[ -z "$_tables" ] && return
- while : ; do
+ while :; do
cat << __EOT
The available keyboard encoding tables are:
diff --git a/distrib/cats/ramdisk/install.md b/distrib/cats/ramdisk/install.md
index f00ca90987b..dd4cd4669fa 100644
--- a/distrib/cats/ramdisk/install.md
+++ b/distrib/cats/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.7 2005/02/27 09:01:34 david Exp $
+# $OpenBSD: install.md,v 1.8 2005/03/26 01:40:20 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@ It is more a question of firmware compatibility disk portability.
(Once we can figure out what filesystems ABLE can boot)
__EOT
- while : ; do
+ while :; do
ask "Use BSD or MBR partition table?" BSD
_resp=$resp
case $_resp in
diff --git a/distrib/i386/common/install.md b/distrib/i386/common/install.md
index c0e10a2212b..1316920be3c 100644
--- a/distrib/i386/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.24 2004/09/12 21:01:27 deraadt Exp $
+# $OpenBSD: install.md,v 1.25 2005/03/26 01:40:20 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@ md_set_term() {
ask_yn "Do you wish to select a keyboard encoding table?"
[[ $resp == n ]] && return
- while : ; do
+ while :; do
ask "Select your keyboard type: (P)C-AT/XT, (U)SB or 'done'" P
case $resp in
P*|p*) _tables="be br de dk es fr it jp lt no pt ru sf sg sv ua uk us"
@@ -70,7 +70,7 @@ md_set_term() {
[ -z "$_tables" ] && return
- while : ; do
+ while :; do
cat << __EOT
The available keyboard encoding tables are:
diff --git a/distrib/macppc/ramdisk/install.md b/distrib/macppc/ramdisk/install.md
index ca13d49803c..aa0d9f5a1c7 100644
--- a/distrib/macppc/ramdisk/install.md
+++ b/distrib/macppc/ramdisk/install.md
@@ -1,4 +1,4 @@
-# $OpenBSD: install.md,v 1.26 2004/07/18 01:14:04 deraadt Exp $
+# $OpenBSD: install.md,v 1.27 2005/03/26 01:40:20 krw Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ disk partitioned with an MBR partition table.
__EOT
- while : ; do
+ while :; do
ask "Use HFS or MBR partition table?" HFS
_resp=$resp
case $_resp in
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index 9fa8931ce42..5b92fe5f5c3 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.149 2004/11/06 18:05:48 deraadt Exp $
+# $OpenBSD: install.sh,v 1.150 2005/03/26 01:40:21 krw 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
@@ -85,7 +85,7 @@ if [ ! -f /etc/fstab ]; then
DISK=
_DKDEVS=$DKDEVS
- while : ; do
+ while :; do
_DKDEVS=`rmel "$DISK" $_DKDEVS`
# Always do ROOTDISK first, and repeat until
@@ -162,7 +162,7 @@ if [ ! -f /etc/fstab ]; then
# Now prompt the user for the mount points.
_i=0
- while : ; do
+ while :; do
_pp=${_partitions[$_i]}
_ps=$(( ${_psizes[$_i]} / 2 ))
_mp=${_mount_points[$_i]}
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 8ebe0a7dbd7..aa6a89f8d75 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.363 2005/03/14 02:29:33 krw Exp $
+# $OpenBSD: install.sub,v 1.364 2005/03/26 01:40:21 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback
@@ -255,7 +255,7 @@ ask() {
local _question=$1 _default=$2
set -o noglob
- while : ; do
+ while :; do
echo -n "$_question "
[[ -z $_default ]] || echo -n "[$_default] "
read resp
@@ -296,7 +296,7 @@ ask_yn() {
local _q=$1 _a=${2:-no} _resp
typeset -l _resp
- while : ; do
+ while :; do
ask "$_q" "$_a"
_resp=$resp
case $_resp in
@@ -477,7 +477,7 @@ addhostent() {
select_sets() {
local _avail=$1 _selected=$2 _next _f _action
- while : ; do
+ while :; do
_action=
cat << __EOT
@@ -527,7 +527,7 @@ __EOT
configure_ifs() {
local _IFDEVS=$IFDEVS _ifs _name _media _hn
- while : ; do
+ while :; do
ask_which "interface" "do you wish to initialize" "$_IFDEVS" \
"" "No more interfaces to initialize"
[[ $resp == done ]] && break
@@ -675,7 +675,7 @@ v4_defroute() {
_dr=$(route -n show -inet | sed -ne '/^default */{s///; s/ .*//; p;}')
[[ -f /tmp/dhclient.conf ]] && _dr=dhcp
- while : ; do
+ while :; do
ask_until "$_prompt" "$_dr"
case $resp in
none|dhcp) break ;;
@@ -982,7 +982,7 @@ install_url() {
# Get server IP address or hostname
: ${_prompt:="Server? (IP address, hostname or 'done')"}
- while : ; do
+ while :; do
eval resp=\$_${_url_type}_server_ip
ask_until "$_prompt" "$resp"
case $resp in
@@ -1072,7 +1072,7 @@ install_url() {
install_mounted_fs() {
local _mp=$1 _dir=$2
- while : ; do
+ while :; do
ask_until "Pathname to the sets? (or 'done')" "$_dir"
case $resp in
done) return
@@ -1226,7 +1226,7 @@ set_timezone() {
: ${TZ:=GMT}
- while : ; do
+ while :; do
_zonepath=$_zoneroot
ask "What timezone are you in? ('?' for list)" "$TZ"
@@ -1288,7 +1288,7 @@ successfully loaded. If you are not sure what sets to ${MODE}, refer to the
installation notes for details on the contents of each.
__EOT
- while : ; do
+ while :; do
_d=
cat << __EOT