baseimage: removed /etc/timezone file

tzdata 2025c-2
* https://tracker.debian.org/news/1698546/accepted-tzdata-2025c-2-source-into-unstable/
* https://sources.debian.org/src/tzdata/2025c-2/debian/NEWS

Author: minimum2scp

baseimage/build/opt/init-wrapper/pre-init.d/01-set-lang-and-tz

@@ -13,9 +13,11 @@ if [ -n "${DEFAULT_LANG}" ]; then
 fi
 
 if [ -n "${DEFAULT_TZ}" ]; then
-  echo "${DEFAULT_TZ}" > /etc/timezone
-  # workaround: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813226
-  [ -L /etc/localtime ] && rm /etc/localtime
-  dpkg-reconfigure -f noninteractive tzdata 1>/dev/null 2>/dev/null
-  etckeeper commit "set timezone to ${DEFAULT_TZ}" 1>/dev/null 2>/dev/null
+  if [ -e /usr/share/zoneinfo/${DEFAULT_TZ} ]; then
+    TZ_FILE=$(readlink -f /usr/share/zoneinfo/${DEFAULT_TZ})
+    ln -nsf ${TZ_FILE} /etc/localtime
+    if etckeeper unclean 1>/dev/null 2>/dev/null; then
+      etckeeper commit "set timezone to ${DEFAULT_TZ}" 1>/dev/null 2>/dev/null
+    fi
+  fi
 fi

baseimage/build/scripts/01-setup

@@ -57,10 +57,7 @@ etckeeper commit "localepurge: purge locales other than en and ja"
 ##
 ## configure timezone
 ##
-echo "Asia/Tokyo" > /etc/timezone
-# workaround: see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813226
-[ -L /etc/localtime ] && rm /etc/localtime
-dpkg-reconfigure -f noninteractive tzdata
+ln -nsf /usr/share/zoneinfo/Asia/Tokyo /usr/localtime
 etckeeper commit "set timezone"
 
 ##

spec/baseimage/00base_spec.rb

@@ -71,10 +71,6 @@
       its(:content){ should match /^ja_JP\.UTF-8\s+UTF-8\s*/ }
     end
 
-    describe file("/etc/timezone") do
-      its(:content){ should include 'Asia/Tokyo' }
-    end
-
     describe file("/etc/localtime") do
       it { should be_linked_to '/usr/share/zoneinfo/Asia/Tokyo' }
     end
@@ -223,10 +219,6 @@
       its(:content){ should include 'LANG=en_US.UTF-8' }
     end
 
-    describe file("/etc/timezone") do
-      its(:content){ should include 'Etc/UTC' }
-    end
-
     describe file("/etc/localtime") do
       it { should be_linked_to '/usr/share/zoneinfo/Etc/UTC' }
     end