diff options
| -rw-r--r-- | distrib/miniroot/install.sh | 4 | ||||
| -rw-r--r-- | distrib/miniroot/install.sub | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index f6db8f15d21..483bdb58b36 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.134 2003/07/03 15:19:01 krw Exp $ +# $OpenBSD: install.sh,v 1.135 2003/08/07 19:12:59 deraadt 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 @@ -165,7 +165,7 @@ if [ ! -f /etc/fstab ]; then # But we really don't want it in the installed # /etc/fstab. grep -v "^$SWAPDEV" $SWAPLIST > $SWAPLIST.tmp - mv $SWAPLIST.tmp $SWAPLIST + mv $SWAPLIST.tmp $SWAPLIST else echo "ERROR: Unable to use $SWAPDEV for swap space." DISK= diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index bdfb0b0e0f1..5377446939e 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.314 2003/07/10 15:03:19 krw Exp $ +# $OpenBSD: install.sub,v 1.315 2003/08/07 19:13:00 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -237,7 +237,7 @@ ask_until () { # $resp holds device selected at exit, or 'done' ask_which () { local _name=$1 _query=$2 _devs=$3 _defdev=$4 - + set -- $_devs if [[ $# -lt 1 ]]; then echo "Done - no available ${_name}s found." @@ -927,7 +927,7 @@ install_url() { eval _${_url_type}_server_ip=${1%%/*} eval _${_url_type}_server_dir=${1#*/}/$SETDIR # Repeat loop to get user to confirm server address. - ;; + ;; *) eval _${_url_type}_server_ip=$resp break ;; |