aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch')
-rw-r--r--main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch b/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch
deleted file mode 100644
index 14b4fcdab1..0000000000
--- a/main/alpine-conf/0001-setup-timezone-fix-use-of-z-option.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 21a2a17a6365f1d0c6ab2ba5826896e9b1491e99 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 10 Aug 2015 10:37:05 +0200
-Subject: [PATCH] setup-timezone: fix use of -z option
-
-ref #4518
----
- setup-timezone.in | 10 +++++-----
- 1 file 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
-
---
-2.5.0
-