r2108 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed Oct 12 03:32:33 PDT 2005


Author: manuel
Date: 2005-10-12 04:32:31 -0600 (Wed, 12 Oct 2005)
New Revision: 2108

Modified:
   jhalfs/trunk/dump-lfs-scripts.xsl
   jhalfs/trunk/functions
   jhalfs/trunk/jhalfs
Log:
Added support to set the local time zone.

Modified: jhalfs/trunk/dump-lfs-scripts.xsl
===================================================================
--- jhalfs/trunk/dump-lfs-scripts.xsl	2005-10-12 10:07:29 UTC (rev 2107)
+++ jhalfs/trunk/dump-lfs-scripts.xsl	2005-10-12 10:32:31 UTC (rev 2108)
@@ -174,6 +174,9 @@
 
   <xsl:template match="replaceable">
     <xsl:choose>
+      <xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
+        <xsl:text>$TIMEZONE</xsl:text>
+      </xsl:when>
       <xsl:when test="ancestor::sect1[@id='ch-system-groff']">
         <xsl:text>$PAGE</xsl:text>
       </xsl:when>

Modified: jhalfs/trunk/functions
===================================================================
--- jhalfs/trunk/functions	2005-10-12 10:07:29 UTC (rev 2107)
+++ jhalfs/trunk/functions	2005-10-12 10:32:31 UTC (rev 2108)
@@ -32,8 +32,6 @@
   @echo
   @echo -e \\t- Set a password for the root user
   @echo
-  @echo -e \\t- Set your local time zone. See chapter06/glibc.html
-  @echo
   @echo -e \\t- Edit /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
   @echo -e \\t/etc/sysconfig/console, /etc/sysconfig/network,
   @echo -e \\t/etc/sysconfig/ifconfig.eth0/ipv4 and any other configuration

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-12 10:07:29 UTC (rev 2107)
+++ jhalfs/trunk/jhalfs	2005-10-12 10:32:31 UTC (rev 2108)
@@ -606,6 +606,16 @@
 ) >> $MKFILE.tmp
     fi
 
+    # For Glibc we need to set TIMEZONE envar.
+    if [ "$i" = "066-glibc" ] ; then
+(
+    cat << EOF
+	@echo "TIMEZONE=\$(TIMEZONE)" >> envars && \\
+	echo "export TIMEZONE" >> envars
+EOF
+) >> $MKFILE.tmp
+    fi
+
     # For Groff we need to set PAGE envar.
     if [ "$i" = "082-groff" ] ; then
 (
@@ -781,6 +791,7 @@
 SRC= /sources
 LFS= $BUILDDIR
 PAGE= $PAGE
+TIMEZONE= $TIMEZONE
 
 include functions
 




More information about the alfs-log mailing list