aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2001-06-19 22:42:12 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2001-06-19 22:42:12 +0000
commit9bb59863bb6f251f4f950f489ac6571f567fd016 (patch)
treec2da06787925c0df31ce85afe8164d65789ccbe1
parentc091a4a199f8d50432d101477a475604b5ebac13 (diff)
Removed the <blockquote><literallayout> and their closing tags from
chrootcmd.xml and added them to the files that call chrootcmd. This allows for adding more commands around chroot (like logout in glibc-inst.xml) git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@679 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter06/bash-inst.xml4
-rw-r--r--chapter06/chroot.xml4
-rw-r--r--chapter06/chrootcmd.xml2
-rw-r--r--chapter06/glibc-inst.xml5
-rw-r--r--chapter06/m4-inst.xml4
5 files changed, 13 insertions, 6 deletions
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index 46f59ef69..ea0e51b00 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -20,7 +20,9 @@ The static bash is replaced with the dynamic bash and the chroot'ed
environment is re-entered by running:
</para>
-&c6-chrootcmd;
+<blockquote><literallayout>
+ &c6-chrootcmd;
+</literallayout></blockquote>
</sect2>
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index 17745173c..42717e2ea 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -13,7 +13,9 @@ everything a user does will be restricted to the LFS partition (since / is
actually /mnt/lfs but the shell doesn't know that).
</para>
-&c6-chrootcmd;
+<blockquote><literallayout>
+ &c6-chrootcmd;
+</literallayout></blockquote>
<para>
The TERM=$TERM construction will set the $TERM value inside
diff --git a/chapter06/chrootcmd.xml b/chapter06/chrootcmd.xml
index 9b3b7e881..ea78af0c1 100644
--- a/chapter06/chrootcmd.xml
+++ b/chapter06/chrootcmd.xml
@@ -1,6 +1,4 @@
-<blockquote><literallayout>
<userinput>cd $LFS &amp;&amp;</userinput>
<userinput>chroot $LFS /usr/bin/env -i HOME=/root
\</userinput>
<userinput>&nbsp;&nbsp;&nbsp;TERM=$TERM /bin/bash --login</userinput>
-</literallayout></blockquote>
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index ba7463e4a..5a4dbed5a 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -69,7 +69,10 @@ to ensure a properly working bash.
Run the following commands to accomplish this:
</para>
-&c6-chrootcmd;
+<blockquote><literallayout>
+ <userinput>logout</userinput>
+ &c6-chrootcmd;
+</literallayout></blockquote>
</sect2>
diff --git a/chapter06/m4-inst.xml b/chapter06/m4-inst.xml
index 76ae89340..c372d5df0 100644
--- a/chapter06/m4-inst.xml
+++ b/chapter06/m4-inst.xml
@@ -44,7 +44,9 @@ this can be done
after having rebooted into the LFS system rather than chrooting into it.
</para>
-&c6-chrootcmd;
+<blockquote><literallayout>
+ &c6-chrootcmd;
+</literallayout></blockquote>
</sect2>