aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-17 01:18:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-11-17 01:18:22 +0000
commit33443d2a8c3a202311751c6de72d7815d22f79f7 (patch)
treecf4f7b07852d4035b9e4a057fcb5858e6a6f1c04
parent5e36196651a14dd0588c9952698d8d68cdd44f1a (diff)
downloadupstream-33443d2a8c3a202311751c6de72d7815d22f79f7.tar.gz
upstream-33443d2a8c3a202311751c6de72d7815d22f79f7.tar.bz2
upstream-33443d2a8c3a202311751c6de72d7815d22f79f7.zip
base-files: now that we have date -k, adjust the kernel timezone after setting up TZ and localtime
SVN-Revision: 29204
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot5
2 files changed, 5 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 61043c295a..b93d2cb402 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=95
+PKG_RELEASE:=96
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 44b53fe27a..7eb4541ce2 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -15,13 +15,16 @@ system_config() {
config_get conloglevel "$cfg" conloglevel
config_get buffersize "$cfg" buffersize
[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
-
+
config_get timezone "$cfg" timezone 'UTC'
echo "$timezone" > /tmp/TZ
config_get zonename "$cfg" zonename
[ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+ # apply timezone to kernel
+ date -k
+
if [ -x /sbin/syslogd ]; then
local args log_ip log_size log_port log_type log_file
config_get log_ip "$cfg" log_ip