r3910 - jhalfs/branches/new_features/LFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sat Mar 11 11:37:26 PST 2017


Author: pierre
Date: Sat Mar 11 11:37:26 2017
New Revision: 3910

Log:
Test for FQDN in <replaceable> tags, instead of HOSTNAME, for the full
name of the host. Adapted only to LFS-20170310 and up.

Modified:
   jhalfs/branches/new_features/LFS/lfs.xsl

Modified: jhalfs/branches/new_features/LFS/lfs.xsl
==============================================================================
--- jhalfs/branches/new_features/LFS/lfs.xsl	Sat Mar 11 08:53:29 2017	(r3909)
+++ jhalfs/branches/new_features/LFS/lfs.xsl	Sat Mar 11 11:37:26 2017	(r3910)
@@ -609,14 +609,19 @@
       <xsl:when test="contains(string(.),'192.168.1.1')">
         <xsl:value-of select="$ip"/>
       </xsl:when>
+      <xsl:when test="contains(string(.),'192.168.0.2')">
+        <xsl:value-of select="$ip"/>
+      </xsl:when>
+<!-- Only adapted to LFS-20170310 and later -->
       <xsl:when test="contains(string(.),'HOSTNAME')">
         <xsl:value-of select="$hostname"/>
-        <xsl:text>.</xsl:text>
-        <xsl:value-of select="$domain"/>
       </xsl:when>
-      <xsl:when test="contains(string(.),'alias')">
+      <xsl:when test="contains(string(.),'FQDN')">
         <xsl:value-of select="$hostname"/>
+        <xsl:text>.</xsl:text>
+        <xsl:value-of select="$domain"/>
       </xsl:when>
+      <xsl:when test="contains(string(.),'alias')"/>
       <xsl:when test="contains(string(.),'<lfs>')">
         <xsl:value-of select="$hostname"/>
       </xsl:when>


More information about the alfs-log mailing list