Changeset 47980

Timestamp:

2015-12-23T15:44:31+01:00 (2 years ago)

Author:

blogic

Message:

base-files: allow timezone to be overriden by zonename (proper zoneinfo support)

Signed-off-by: Roman Yeryomin <roman@…>

Location:

trunk/package/base-files

Files:

• Makefile (modified) (2 diffs)
• files/etc/init.d/system (modified) (1 diff)

trunk/package/base-files/Makefile

@@ -12 +12 @@
 
 PKG_NAME:=base-files
-PKG_RELEASE:=164
+PKG_RELEASE:=165
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -162 +162 @@
         $(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

trunk/package/base-files/files/etc/init.d/system

@@ -28 +28 @@
         [ -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