diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-10 10:37:05 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-08-10 10:37:05 +0200 |
| commit | 21a2a17a6365f1d0c6ab2ba5826896e9b1491e99 (patch) | |
| tree | db6fa82b303e4658b9eee08c4c34c369e81fa405 | |
| parent | 848a2ab24f28a2205d8b0700ff138ece03bca534 (diff) | |
| download | alpine-conf-21a2a17a6365f1d0c6ab2ba5826896e9b1491e99.tar.bz2 alpine-conf-21a2a17a6365f1d0c6ab2ba5826896e9b1491e99.tar.xz | |
setup-timezone: fix use of -z option
ref #4518
| -rw-r--r-- | setup-timezone.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setup-timezone.in b/setup-timezone.in index 6964f69..514f9ca 100644 --- a/setup-timezone.in +++ b/setup-timezone.in @@ -8,7 +8,7 @@ zroot=/usr/share/zoneinfo usage() { cat <<__EOF__ -usage: setup-timezone [-h] [-k|-i] [-z subdir of $zroot] +usage: setup-timezone [-h] [-k|-i] [-z TIMEZONE] Sets the timezone for the system. @@ -16,7 +16,7 @@ options: -h Show this help -i Install tzdata and symlink instead of making a copy -k Keep previous copies of tzdata - -z Specify the timezone as a subdirectory of $zroot + -z Set given timezone. (relative $zroot) __EOF__ exit 1 } @@ -64,7 +64,7 @@ while getopts "hikz:" opt; do h) usage;; i) INSTALL_TZDATA=true;; k) KEEP_TZDATA=true;; - z) ZONEINFODIR="$OPTARG";; + z) ZONE="$OPTARG";; esac done @@ -87,8 +87,8 @@ fi while true; do - if [ -n "$ZONEINFODIR" ]; then - setup_tz "$ZONEINFODIR" + if [ -n "$ZONE" ]; then + setup_tz "$zroot"/"$ZONE" break fi |