Author: pierre
Date: Sun Mar 29 06:42:43 2020
New Revision: 4140

Log:
Do not rely on /tools for setting ROOT (again)

Using the chapter ancestor is not enough. It's better to use the sect1 id
and test that it starts with ch-tools: package-manager does not have this
ancestor. Also the virtual kernel filesystems are done before chroot,
so directly test this one.

This works for the current lfs book. We'll need something new if we
change the order of pages.

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==============================================================================
--- jhalfs/trunk/LFS/lfs.xsl    Sun Mar 29 06:24:48 2020        (r4139)
+++ jhalfs/trunk/LFS/lfs.xsl    Sun Mar 29 06:42:43 2020        (r4140)
@@ -1144,7 +1144,8 @@
       <!-- get the location of the system root -->
 ROOT=</xsl:text>
     <xsl:choose>
-      <xsl:when test="ancestor::chapter/@id = 'chapter-temporary-tools'">
+      <xsl:when test="starts-with(./@id, 'ch-tools') or
+                      contains   (./@id, 'kernfs')">
         <xsl:text>$LFS/
 </xsl:text>
       </xsl:when>
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

Reply via email to