Changeset 57a5e9a

Timestamp:

05/12/2024 07:59:27 PM (4 weeks ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

trunk

Parents:

d3df258

Message:

Remove --from lfs from chown for now

We've added --from lfs for chown commands in the beginning of chap 7 to
avoid breaking host distro completely in case the user has not set $LFS
correctly. But jhalfs deletes the lfs user before running the
changingowner script, thus "chown --from lfs" fails because "lfs" does
not exist.

For now just remove "--from lfs" from the chown commands. Technically
we should remove the lfs user after the chown commands (because having
files owned by unnamed UID is bad).

File:

• LFS/lfs.xsl (modified) (1 diff)

LFS/lfs.xsl

@@ -574 +574 @@
         <xsl:text>&#xA;</xsl:text>
       </xsl:when><!-- temp chapters install -->
+      <!-- In jhalfs chaningowner is executed AFTER userdel lfs
+           so chown \-\- from lfs errors out.  -->
+      <xsl:when test="contains(string(),'--from lfs')">
+        <xsl:copy-of select="substring-before(string(), '--from lfs')"/>
+        <xsl:choose>
+          <xsl:when test="contains(substring-after(string(),'--from lfs'),
+                                   '--from lfs')">
+            <xsl:copy-of select="substring-before(
+                                   substring-after(string(),'--from lfs'),
+                                   '--from lfs')"/>
+            <xsl:copy-of select="substring-after(
+                                   substring-after(string(),'--from lfs'),
+                                   '--from lfs')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:copy-of select="string()"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:when>
       <!-- The rest of commands -->
       <xsl:otherwise>