Changes in npl/system/glibc/doinst.sh-glibc [1a19ecd:c5c522c]

File:

• npl/system/glibc/doinst.sh-glibc (modified) (2 diffs)

npl/system/glibc/doinst.sh-glibc

@@ -70 +70 @@
 rm -rf lib/incoming
 # Done installing NPTL glibc libraries.
+
+# Timezone stuff:
+if [ -L etc/localtime -a ! -r etc/localtime-copied-from ]; then
+  mv etc/localtime etc/localtime-copied-from
+  chroot . /bin/cp etc/localtime-copied-from etc/localtime
+fi
+# Add the default timezone in /etc, if none exists:
+if [ ! -r etc/localtime ]; then
+  ( cd etc ; rm -rf localtime localtime-copied-from )
+  ( cd etc ; ln -sf /usr/share/zoneinfo/Factory localtime-copied-from )
+  chroot . /bin/cp etc/localtime-copied-from etc/localtime
+fi
+# Add the default link in /usr/share/zoneinfo, if none exists:
+if [ ! -L usr/share/zoneinfo/localtime ]; then
+  ( cd usr/share/zoneinfo ; rm -rf localtime )
+  ( cd usr/share/zoneinfo ; ln -sf /etc/localtime localtime )
+fi
+( cd usr/share/zoneinfo ; rm -rf timeconfig )
+( cd usr/share/zoneinfo ; ln -sf /usr/sbin/timeconfig timeconfig )
 
 # Handle config files:
@@ -146 +165 @@
 ( cd usr/lib ; rm -rf libnss_files.so )
 ( cd usr/lib ; ln -sf ../../lib/libnss_files.so.2 libnss_files.so )
-# This is now a linker script:
-#( cd usr/lib ; rm -rf libm.so )
-#( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
+( cd usr/lib ; rm -rf libm.so )
+( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
 ( cd usr/lib ; rm -rf libutil.so )
 ( cd usr/lib ; ln -sf ../../lib/libutil.so.1 libutil.so )