Changeset 1330ebc for LFS

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.

Location:

LFS

Files:

• lfs.xsl (modified) (1 diff)
• master.sh (modified) (1 diff)

LFS/lfs.xsl

@@ -80 +80 @@
         <!-- Creating dirs and files -->
       <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-        <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+        <xsl:choose>
+          <xsl:when test="@id='ch-system-creatingdirs' or
+                    @id='ch-system-createfiles'">
+            <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>#!/bin/bash&#xA;set +h&#xA;</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
         <xsl:if test="not(@id='ch-tools-stripping') and
                       not(@id='ch-system-strippingagain')">

LFS/master.sh

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