CLFS/master.sh, make FSTAB available in minimal boot mode
This commit is contained in:
parent
0271c0c10d
commit
a9490abe12
3 changed files with 88 additions and 3 deletions
|
@ -0,0 +1,84 @@
|
|||
<?xml version="1.0"?>
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
xmlns:exsl="http://exslt.org/common"
|
||||
extension-element-prefixes="exsl"
|
||||
version="1.0">
|
||||
|
||||
<!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
|
||||
|
||||
<xsl:template match="/">
|
||||
<xsl:apply-templates select="//sect1"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="sect1">
|
||||
<!-- The dirs names -->
|
||||
<xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
|
||||
<xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>
|
||||
<xsl:variable name="quote-dir" select="substring($pi-dir-value,1,1)"/>
|
||||
<xsl:variable name="dirname" select="substring-before(substring($pi-dir-value,2),$quote-dir)"/>
|
||||
<!-- The file names -->
|
||||
<xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
|
||||
<xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
|
||||
<xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
|
||||
<!-- The build order -->
|
||||
<xsl:variable name="position" select="position()"/>
|
||||
<xsl:variable name="order">
|
||||
<xsl:choose>
|
||||
<xsl:when test="string-length($position) = 1">
|
||||
<xsl:text>00</xsl:text>
|
||||
<xsl:value-of select="$position"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="string-length($position) = 2">
|
||||
<xsl:text>0</xsl:text>
|
||||
<xsl:value-of select="$position"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="$position"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<!-- Creating dirs and files -->
|
||||
<exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
|
||||
<xsl:apply-templates select=".//screen"/>
|
||||
</exsl:document>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="screen">
|
||||
<xsl:if test="child::* = userinput">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@role = 'nodump'"/>
|
||||
<xsl:when test="@role = 'root'">
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:text># Run this as root</xsl:text>
|
||||
<xsl:apply-templates select="userinput"/>
|
||||
<xsl:text># End root commands</xsl:text>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:apply-templates select="userinput"/>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:if>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="userinput">
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:if test=".//replaceable">
|
||||
<xsl:text># This block must be edited to suit your needs.</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:apply-templates/>
|
||||
<xsl:text>
</xsl:text>
|
||||
<xsl:if test=".//replaceable">
|
||||
<xsl:text># End of editable block.</xsl:text>
|
||||
</xsl:if>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="replaceable">
|
||||
<xsl:text>**EDITME</xsl:text>
|
||||
<xsl:apply-templates/>
|
||||
<xsl:text>EDITME**</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
|
@ -987,6 +987,8 @@ bm_bootable_Makefiles() { #
|
|||
# Select a script execution method
|
||||
case $this_script in
|
||||
*fstab*) if [[ -n "$FSTAB" ]]; then
|
||||
# Minimal boot mode has no access to original file, store in /sources
|
||||
cp $FSTAB $BUILDDIR/sources/fstab
|
||||
wrt_copy_fstab2 "${this_script}"
|
||||
else
|
||||
wrt_run_as_root2 "${this_script}" "${file}"
|
||||
|
|
|
@ -413,7 +413,7 @@ wrt_copy_fstab2() { #
|
|||
(
|
||||
cat << EOF
|
||||
@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >logs/$i && \\
|
||||
cp -v $FSTAB /etc/fstab >>logs/$i 2>&1 && \\
|
||||
cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1 && \\
|
||||
echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >>logs/$i
|
||||
EOF
|
||||
) >> $MKFILE.tmp
|
||||
|
@ -622,8 +622,7 @@ extract_commands() { #
|
|||
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture"
|
||||
xsltproc --xinclude \
|
||||
--nonet \
|
||||
--output ./${PROGNAME}-commands/ \
|
||||
$BOOK/stylesheets/dump-commands.xsl $BOOK/$ARCH-index.xml
|
||||
-o ./${PROGNAME}-commands/ $XSL $BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1
|
||||
;;
|
||||
hlfs)
|
||||
echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
|
||||
|
|
Reference in a new issue