summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2004-07-17 02:13:54 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2004-07-17 02:13:54 +0000
commit5757b9a265e6ab7af9c725d74bf16cbf90747d02 (patch)
tree46b6f4ec74e814322cb4e4fc3f13af227d307682
parentc3ac63feb76baafe211da667bdeb634f98a5c940 (diff)
Don't add '/'s to timezone path when null input entered
as sub-timezone. Pointed out by cloder@.
-rw-r--r--distrib/miniroot/install.sub12
1 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 7b33f9ed44f..8cb489f76a3 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.343 2004/06/26 20:10:17 krw Exp $
+# $OpenBSD: install.sub,v 1.344 2004/07/17 02:13:53 krw 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
@@ -1382,11 +1382,11 @@ set_timezone() {
while [[ -d $_zonepath ]]; do
ask "What sub-timezone of '${_zonepath#$_zoneroot}' are you in? ('?' for list)"
- if [[ $resp == ? ]]; then
- ls -F $_zonepath
- else
- _zonepath=$_zonepath/$resp
- fi
+ case $resp in
+ "") ;;
+ ?) ls -F $_zonepath ;;
+ *) _zonepath=$_zonepath/$resp ;;
+ esac
done
if [[ -f $_zonepath ]]; then