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

This commit is contained in:
Pierre Labastie 2018-02-04 15:19:14 +00:00
parent b7583ec500
commit bcbecc53f9

View file

@ -427,7 +427,9 @@ fi
<xsl:text>sudo -E sh &lt;&lt; ROOT_EOF&#xA;</xsl:text> <xsl:text>sudo -E sh &lt;&lt; ROOT_EOF&#xA;</xsl:text>
</xsl:if> </xsl:if>
<xsl:if test="$wrap-install = 'y' and <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 <xsl:text>if [ -r "$JH_PACK_INSTALL" ]; then
source $JH_PACK_INSTALL source $JH_PACK_INSTALL
export -f wrapInstall export -f wrapInstall
@ -440,13 +442,17 @@ wrapInstall '
<xsl:apply-templates mode="root"/> <xsl:apply-templates mode="root"/>
<xsl:if test="not(following-sibling::screen[1][@role='root'])"> <xsl:if test="not(following-sibling::screen[1][@role='root'])">
<xsl:if test="$del-la-files = 'y' and <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:call-template name="output-root">
<xsl:with-param name="out-string" select="$la-files-instr"/> <xsl:with-param name="out-string" select="$la-files-instr"/>
</xsl:call-template> </xsl:call-template>
</xsl:if> </xsl:if>
<xsl:if test="$wrap-install = 'y' and <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:text>'&#xA;packInstall</xsl:text>
</xsl:if> </xsl:if>
<xsl:if test="$sudo = 'y'"> <xsl:if test="$sudo = 'y'">