[alfs-log] r4038 - jhalfs/trunk/BLFS/xsl

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Feb 4 07:19:15 PST 2018


Author: pierre
Date: Sun Feb  4 07:19:14 2018
New Revision: 4038

Log:
Don't generate porg and del .la instructions when doing userad or groupadd

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/scripts.xsl	Sun Feb  4 00:50:16 2018	(r4037)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl	Sun Feb  4 07:19:14 2018	(r4038)
@@ -427,7 +427,9 @@
               <xsl:text>sudo -E sh << ROOT_EOF&#xA;</xsl:text>
             </xsl:if>
             <xsl:if test="$wrap-install = 'y' and
-                          ancestor::sect2[@role='installation']">
+                          ancestor::sect2[@role='installation'] and
+                          not(contains(string(),'useradd')) and
+                          not(contains(string(),'groupadd'))">
               <xsl:text>if [ -r "$JH_PACK_INSTALL" ]; then
   source $JH_PACK_INSTALL
   export -f wrapInstall
@@ -440,13 +442,17 @@
           <xsl:apply-templates mode="root"/>
           <xsl:if test="not(following-sibling::screen[1][@role='root'])">
             <xsl:if test="$del-la-files = 'y' and
-                          ancestor::sect2[@role='installation']">
+                          ancestor::sect2[@role='installation'] and
+                          not(contains(string(),'useradd')) and
+                          not(contains(string(),'groupadd'))">
               <xsl:call-template name="output-root">
                 <xsl:with-param name="out-string" select="$la-files-instr"/>
               </xsl:call-template>
             </xsl:if>
             <xsl:if test="$wrap-install = 'y' and
-                          ancestor::sect2[@role='installation']">
+                          ancestor::sect2[@role='installation'] and
+                          not(contains(string(),'useradd')) and
+                          not(contains(string(),'groupadd'))">
               <xsl:text>'&#xA;packInstall</xsl:text>
             </xsl:if>
             <xsl:if test="$sudo = 'y'">


More information about the alfs-log mailing list