aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/bash.xml4
-rw-r--r--chapter06/chroot.xml2
-rw-r--r--chapter06/revisedchroot.xml7
-rw-r--r--chapter06/strippingagain.xml7
4 files changed, 11 insertions, 9 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 1d1e9fc10..aeaada511 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -39,11 +39,11 @@
<sect2 role="installation">
<title>Installation of Bash</title>
-
+<!--
<para>Incorporate some upstream fixes:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
+-->
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index d946e5664..c4a66bf00 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -18,7 +18,7 @@
<screen role="nodump"><userinput>chroot "$LFS" /tools/bin/env -i \
HOME=/root \
TERM="$TERM" \
- PS1='\u:\w\$ ' \
+ PS1='(lfs chroot) \u:\w\$ ' \
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
/tools/bin/bash --login +h</userinput></screen>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 7c7e6f0f3..6edd0e524 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -17,9 +17,10 @@
<para>From now on, when reentering the chroot environment after
exiting, use the following modified chroot command:</para>
-<screen role="nodump"><userinput>chroot "$LFS" /usr/bin/env -i \
- HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
- PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+<screen role="nodump"><userinput>chroot "$LFS" /usr/bin/env -i \
+ HOME=/root TERM="$TERM" \
+ PS1='(lfs chroot) \u:\w\$ ' \
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
/bin/bash --login</userinput></screen>
<para>The reason for this is that the programs in <filename
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index a1d1d8388..db4a605b0 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -67,9 +67,10 @@ unset LIB save_lib save_usrlib</userinput></screen>
<para>Then reenter it with:</para>
-<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
- HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
- PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+<screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
+ HOME=/root TERM=$TERM \
+ PS1='(lfs chroot) \u:\w\$ ' \
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin \
/tools/bin/bash --login</userinput></screen>
<para>Now the binaries and libraries can be safely stripped:</para>