fix timezone data ( Different entries in /etc/timezone and /etc/local…

…e.conf files are not consistent. )
GinoHarlos · Nov 25, 2024 · c96d6aa · c96d6aa
1 parent bbb07b0
commit c96d6aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -320,14 +320,9 @@ RUN \
 
 RUN find /var/log -type f -delete
 RUN \
-  find                                                            \
-  /etc                                                            \
-  -maxdepth 1 -type f                                             \
-  -name 'localtime'   -or                                         \
-  -name 'hostname'    -or                                         \
-  -name 'shadow'      -or                                         \
-  -name 'locale.conf' -or                                         \
-  -name 'machine-id'  -delete || /bin/true
+  for file in                                                     \
+    localtime timezone hostname shadow locale.conf machine-id;    \
+  do rm --force /etc/${file}; done
 
 RUN \
   rm --force /var/lib/dbus/machine-id;                            \

diff --git a/root/usr/lib/univention-container-mode/join/00-ucr-defaults b/root/usr/lib/univention-container-mode/join/00-ucr-defaults
@@ -103,10 +103,11 @@ timedatectl set-timezone ${timezone:-UTC} >/dev/null 2>&1 && timedatectl --no-pa
 
 	ln --symbolic --force /usr/share/zoneinfo/${zone} \
 		/etc/localtime
-
-	dpkg-reconfigure -f noninteractive tzdata || /bin/true
 }
 #
+# set timezone data
+dpkg-reconfigure -f noninteractive tzdata || /bin/true
+#
 # set xorg/keyboard
 ucrchanges+=("xorg/keyboard/options/XkbLayout=$(
 	echo ${language:-en_US} | ${awk} '\