Author: blogic Date: 2015-12-23 15:44:31 +0100 (Wed, 23 Dec 2015) New Revision: 47980
Modified: trunk/package/base-files/Makefile trunk/package/base-files/files/etc/init.d/system Log: base-files: allow timezone to be overriden by zonename (proper zoneinfo support) Signed-off-by: Roman Yeryomin <[email protected]> Modified: trunk/package/base-files/Makefile =================================================================== --- trunk/package/base-files/Makefile 2015-12-23 14:44:24 UTC (rev 47979) +++ trunk/package/base-files/Makefile 2015-12-23 14:44:31 UTC (rev 47980) @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=164 +PKG_RELEASE:=165 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=usign/host @@ -161,7 +161,7 @@ rm -f $(1)/var $(LN) /tmp $(1)/var mkdir -p $(1)/etc - $(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ $(1)/etc/ + $(LN) /tmp/resolv.conf /tmp/fstab /tmp/TZ /tmp/localtime $(1)/etc/ chmod 0600 $(1)/etc/shadow chmod 1777 $(1)/tmp Modified: trunk/package/base-files/files/etc/init.d/system =================================================================== --- trunk/package/base-files/files/etc/init.d/system 2015-12-23 14:44:24 UTC (rev 47979) +++ trunk/package/base-files/files/etc/init.d/system 2015-12-23 14:44:31 UTC (rev 47980) @@ -27,7 +27,8 @@ echo "$hostname" > /proc/sys/kernel/hostname [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize} echo "$timezone" > /tmp/TZ - [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime + [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && \ + ln -sf "/usr/share/zoneinfo/$zonename" /tmp/localtime && rm -f /tmp/TZ # apply timezone to kernel date -k _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
