Changeset 1330ebc


Ignore:
Timestamp:
02/17/2007 02:08:46 AM (17 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
c0b307c
Parents:
b7ea8ff
Message:

Fixed chroot environment to be more closed to the one expected by the books.
Need be full tested.

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • CLFS/clfs.xsl

    rb7ea8ff r1330ebc  
    8787            <!-- Creating dirs and files -->
    8888          <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
    89             <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     89            <xsl:choose>
     90              <xsl:when test="@id='ch-chroot-changingowner' or
     91                        @id='ch-chroot-creatingdirs' or
     92                        @id='ch-chroot-createfiles'">
     93                <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
     94              </xsl:when>
     95              <xsl:otherwise>
     96                <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     97              </xsl:otherwise>
     98            </xsl:choose>
    9099            <xsl:if test="not(@id='ch-system-stripping')">
    91100              <xsl:text>set -e</xsl:text>

  • CLFS/master.sh

    rb7ea8ff r1330ebc  
    796796        @sudo make SUDO
    797797        @touch \$@
    798 #
    799 # The convoluted piece of code below is necessary to provide 'make' with a valid shell in the
    800 # chroot environment. (Unless someone knows a different way)
    801 # Manually create the /bin directory and provide link to the /tools dir.
    802 # Also change the original symlink creation to include (f)orce to prevent failure due to
    803 #  pre-existing links.
    804798
    805799#---------------CHROOT JAIL
    806800mk_SYSTOOLS: mk_SUDO
    807         @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
    808           mkdir \$(MOUNT_PT)/bin; \\
    809           cd \$(MOUNT_PT)/bin && \\
    810           ln -svf /tools/bin/bash bash; ln -sf bash sh; \\
    811           sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
    812         fi;
    813         @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chroot/*-createfiles
    814801        @\$(call echo_CHROOT_request)
    815802        @\$(call echo_PHASE, CHROOT JAIL )

  • HLFS/hlfs.xsl

    rb7ea8ff r1330ebc  
    8484        <!-- Creating dirs and files -->
    8585      <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
    86         <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     86        <xsl:choose>
     87          <xsl:when test="@id='ch-system-creatingdirs' or
     88                    @id='ch-system-createfiles'">
     89            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
     90          </xsl:when>
     91          <xsl:otherwise>
     92            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     93          </xsl:otherwise>
     94        </xsl:choose>
    8795        <xsl:if test="not(@id='ch-tools-stripping') and
    8896                      not(@id='ch-system-strippingagain')">

  • HLFS/master.sh

    rb7ea8ff r1330ebc  
    561561
    562562mk_CHROOT: mk_SUDO
    563         @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
    564           mkdir \$(MOUNT_PT)/bin && \\
    565           cd \$(MOUNT_PT)/bin && \\
    566           ln -sf /tools/bin/bash bash; ln -sf bash sh && \\
    567           sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
    568         fi;
    569563        @if [ ! -e \$(MOUNT_PT)/dev ]; then \\
    570564          mkdir \$(MOUNT_PT)/dev && \\
    … …  
    573567          sudo chown -R 0:0 \$(MOUNT_PT)/dev;
    574568        fi;
    575         @sudo sed -e 's|^ln -.. |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
    576569        @\$(call echo_CHROOT_request)
    577570        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")

  • LFS/lfs.xsl

    rb7ea8ff r1330ebc  
    8080        <!-- Creating dirs and files -->
    8181      <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
    82         <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     82        <xsl:choose>
     83          <xsl:when test="@id='ch-system-creatingdirs' or
     84                    @id='ch-system-createfiles'">
     85            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
     86          </xsl:when>
     87          <xsl:otherwise>
     88            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
     89          </xsl:otherwise>
     90        </xsl:choose>
    8391        <xsl:if test="not(@id='ch-tools-stripping') and
    8492                      not(@id='ch-system-strippingagain')">

  • LFS/master.sh

    rb7ea8ff r1330ebc  
    436436mk_SUDO: mk_LUSER
    437437        @sudo make SUDO
    438         touch \$@
    439 #
    440 # The convoluted piece of code below is necessary to provide 'make' with a valid shell in the
    441 # chroot environment. (Unless someone knows a different way)
    442 # Manually create the /bin directory and provide link to the /tools dir.
    443 # Also change the original symlink creation to include (f)orce to prevent failure due to
    444 #  pre-existing links.
    445 #
     438        @touch \$@
     439
    446440mk_CHROOT: mk_SUDO
    447         @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
    448           mkdir \$(MOUNT_PT)/bin; \\
    449           cd \$(MOUNT_PT)/bin && \\
    450           ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
    451           sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
    452         fi;
    453         @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
    454441        @\$(call echo_CHROOT_request)
    455442        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")

  • common/libs/func_wrt_Makefile

    rb7ea8ff r1330ebc  
    1515# Generated on `date "+%F %X %Z"`
    1616
    17 SHELL          = /bin/bash
     17ifeq (\$(shell [ -x /bin/bash ] && echo /bin/bash),/bin/bash)
     18  SHELL = /bin/bash
     19else
     20  SHELL = /tools/bin/bash
     21endif
    1822
    1923SRC            = /sources
    … …  
    105109$i:  $PREV
    106110        @\$(call echo_message, Building)
    107         @./progress_bar.sh \$@ \$\$PPID &
     111        @\$(SHELL) progress_bar.sh \$@ \$\$PPID &
    108112        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@
    109113        @\$(PRT_DU) >>logs/\$@

  • common/progress_bar.sh

    • Property mode changed from 100755 to 100644
    rb7ea8ff r1330ebc  
    1 #!/bin/bash
    21
    32# $Id$
Note: See TracChangeset for help on using the changeset viewer.