Changeset 2484938

Timestamp:

Sep 15, 2006, 7:06:38 AM (18 years ago)

Author:

Chris Staub <chris@…>

Children:

6ec9929

Parents:

142e52c5

Message:

Change occurences of $VARIABLE to $\{VARIABLE\} for consistency

Files:

• boot/common/changingowner.xml (modified) (1 diff)
• boot/common/devices.xml (modified) (1 diff)
• boot/common/introduction.xml (modified) (1 diff)
• chroot/common/chroot.xml (modified) (3 diffs)
• chroot/common/kernfs.xml (modified) (4 diffs)
• final-preps/aboutclfs.xml (modified) (3 diffs)
• final-preps/addinguser.xml (modified) (1 diff)
• final-preps/creatingcrossdir.xml (modified) (3 diffs)
• final-preps/creatingtoolsdir.xml (modified) (3 diffs)
• final-preps/settingenviron.xml (modified) (2 diffs)
• final-system/common/stripping.xml (modified) (1 diff)
• introduction/common/askforhelp.xml (modified) (1 diff)
• materials/common/introduction.xml (modified) (3 diffs)
• materials/common/patches.xml (modified) (1 diff)
• partitioning/common/mounting.xml (modified) (2 diffs)
• prologue/common/typography.xml (modified) (2 diffs)
• temp-system/common/introduction.xml (modified) (2 diffs)
• the-end/reboot.xml (modified) (1 diff)

boot/common/changingowner.xml

@@ -11 +11 @@
   <title>Changing Ownership</title>
 
-  <para os="a">Currently, the <filename class="directory">$CLFS</filename>
+  <para os="a">Currently, the <filename class="directory">${CLFS}</filename>
   directory and all of its subdirectories  are owned by the user
   <systemitem class="username">clfs</systemitem>, a user that exists only
-  on the host system. For security reasons, the $CLFS root directory and
+  on the host system. For security reasons, the ${CLFS} root directory and
   all of it subdirectories should be owned by
   <systemitem class="username">root</systemitem>. Change the ownership
-  for $CLFS and its subdirectories by running this command:</para>
+  for ${CLFS} and its subdirectories by running this command:</para>
 
 <screen os="b"><userinput>chown -Rv root:root ${CLFS}</userinput></screen>

boot/common/devices.xml

@@ -21 +21 @@
       <para>The commands in the remainder of the book should be run as
       the <systemitem class="username">root</systemitem> user. Also,
-      double-check that $CLFS is set as
+      double-check that ${CLFS} is set as
       <systemitem class="username">root</systemitem>.</para>
     </note>

boot/common/introduction.xml

@@ -17 +17 @@
   <para>There are a few additional packages that will need to be
   installed to allow you to boot the minimal system. Some of these
-  packages will be installed onto the root or in /usr on the CLFS
-  partition ($CLFS/bin, $CLFS/usr/lib, etc...), rather than /tools, using the
+  packages will be installed onto root or in /usr on the CLFS
+  partition (${CLFS}/bin, ${CLFS}/usr/bin, etc...), rather than /tools, using the
   "DESTDIR" option with make. This will require the
   <systemitem class="username">clfs</systemitem> user to have write access to
-  the rest of the $CLFS partition, so you will need to temporarily change the
-  ownership of $CLFS to the <systemitem class="username">clfs</systemitem> user.
+  the rest of the CLFS partition, so you will need to temporarily change the
+  ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
   Run the following command as <systemitem
   class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -v clfs $CLFS</userinput></screen>
+<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
 
 </sect1>

chroot/common/chroot.xml

@@ -17 +17 @@
   temporary tools:</para>
 
-<screen><userinput>chroot "$CLFS" /tools/bin/env -i \
-    HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+<screen><userinput>chroot "${CLFS}" /tools/bin/env -i \
+    HOME=/root TERM="${TERM}" PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
     /tools/bin/bash --login +h</userinput></screen>
@@ -27 +27 @@
   <envar>TERM</envar>, <envar>PS1</envar>, and
   <envar>PATH</envar> variables are set again. The
-  <parameter>TERM=$TERM</parameter> construct will set the
+  <parameter>TERM=${TERM}</parameter> construct will set the
   <envar>TERM</envar> variable inside chroot to the same value as
   outside chroot. This variable is needed for programs like
@@ -38 +38 @@
   <envar>CLFS</envar> variable anymore, because all work will be
   restricted to the CLFS file system.  This is because the Bash shell is
-  told that <filename class="directory">$CLFS</filename> is now the root
+  told that <filename class="directory">${CLFS}</filename> is now the root
   (<filename class="directory">/</filename>) directory.</para>
 

chroot/common/kernfs.xml

@@ -23 +23 @@
   be mounted:</para>
 
-<screen><userinput>mkdir -pv $CLFS/{dev,proc,sys}</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}/{dev,proc,sys}</userinput></screen>
 
   <para>Now mount the file systems:</para>
 
-<screen><userinput>mount -vt proc proc $CLFS/proc
-mount -vt sysfs sysfs $CLFS/sys</userinput></screen>
+<screen><userinput>mount -vt proc proc ${CLFS}/proc
+mount -vt sysfs sysfs ${CLFS}/sys</userinput></screen>
 
   <para>Remember that if for any reason you stop working on the CLFS system
@@ -38 +38 @@
   starting Udev early in the boot process, so we create them here:</para>
 
-<screen><userinput>mknod -m 600 $CLFS/dev/console c 5 1
-mknod -m 666 $CLFS/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
+mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
 
   <para>Once the system is complete and booting, the rest of our device
@@ -48 +48 @@
   appear in the new CLFS filesystem:</para>
 
-<screen><userinput>mount -v -o bind /dev $CLFS/dev</userinput></screen>
+<screen><userinput>mount -v -o bind /dev ${CLFS}/dev</userinput></screen>
 
   <para>Additional file systems will soon be mounted from within the chroot 
@@ -54 +54 @@
   for each of these now:</para>
 
-<screen><userinput>mount -f -vt tmpfs tmpfs $CLFS/dev/shm
-mount -f -vt devpts -o gid=4,mode=620 devpts $CLFS/dev/pts</userinput></screen>
+<screen><userinput>mount -f -vt tmpfs tmpfs ${CLFS}/dev/shm
+mount -f -vt devpts -o gid=4,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
 
 </sect1>

final-preps/aboutclfs.xml

@@ -9 +9 @@
   <?dbhtml filename="aboutclfs.html"?>
 
-  <title>About $CLFS</title>
+  <title>About ${CLFS}</title>
 
   <para>Throughout this book, the environment variable <envar>CLFS</envar> will
@@ -16 +16 @@
   Check that the <envar>CLFS</envar> variable is set up properly with:</para>
 
-<screen><userinput>echo $CLFS</userinput></screen>
+<screen><userinput>echo ${CLFS}</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount
@@ -26 +26 @@
 
   <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv $CLFS/tools</command> can be typed literally. The shell
-  will automatically replace <quote>$CLFS</quote> with
+  <command>install -dv ${CLFS}/tools</command> can be typed literally. The shell
+  will automatically replace <quote>${CLFS}</quote> with
   <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
   processes the command line.</para>
 
-  <para>If you haven't created the <filename class="directory">$CLFS</filename>
+  <para>If you haven't created the <filename class="directory">${CLFS}</filename>
   directory, do so at this time by issuing the following commands:</para>
 
-<screen><userinput>install -dv $CLFS</userinput></screen>
+<screen><userinput>install -dv ${CLFS}</userinput></screen>
 
-  <para>Do not forget to check that <envar>$CLFS</envar> is set whenever
+  <para>Do not forget to check that <envar>${CLFS}</envar> is set whenever
   you leave and reenter the current working environment (as when doing a
   <quote>su</quote> to <systemitem class="username">root</systemitem> or

final-preps/addinguser.xml

@@ -79 +79 @@
 
   <para>Grant <systemitem class="username">clfs</systemitem> full access to
-  <filename class="directory">$CLFS/cross-tools</filename> and
-  <filename class="directory">$CLFS/tools</filename> by making <systemitem
+  <filename class="directory">${CLFS}/cross-tools</filename> and
+  <filename class="directory">${CLFS}/tools</filename> by making <systemitem
   class="username">clfs</systemitem> the directorys' owner:</para>
 
-<screen><userinput>chown -v clfs $CLFS/tools
-chown -v clfs $CLFS/cross-tools</userinput></screen>
+<screen><userinput>chown -v clfs ${CLFS}/tools
+chown -v clfs ${CLFS}/cross-tools</userinput></screen>
 
   <para>If a separate working directory was created as suggested, 
   give user <systemitem class="username">clfs</systemitem> ownership of this directory:</para>
 
-<screen><userinput>chown -v clfs $CLFS/sources</userinput></screen>
+<screen><userinput>chown -v clfs ${CLFS}/sources</userinput></screen>
 
   <para>Next, login as user <systemitem class="username">clfs</systemitem>.

final-preps/creatingcrossdir.xml

@@ -9 +9 @@
   <?dbhtml filename="creatingcrossdir.html"?>
 
-  <title>Creating the $CLFS/cross-tools Directory</title>
+  <title>Creating the ${CLFS}/cross-tools Directory</title>
 
   <para>The cross-binutils and cross-compiler built in
   <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">$CLFS/cross-tools</filename> to keep them
+  <filename class="directory">${CLFS}/cross-tools</filename> to keep them
   separate from the host programs. The programs compiled here are
   cross-tools and will not be a part of the final CLFS system or the
@@ -22 +22 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $CLFS/cross-tools</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen>
 
   <para>The next step is to create a <filename
@@ -29 +29 @@
   Run this command as  <systemitem class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $CLFS/cross-tools /</userinput></screen>
+<screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen>
 
   <para>The symlink isn't technically necessary (though the book's
   instructions do assume its existence), but is there mainly for
-  consistency (because /tools is also symlinked to $CLFS/tools) and to
+  consistency (because /tools is also symlinked to ${CLFS}/tools) and to
   simplify the installation of the cross-compile tools.</para>
 

final-preps/creatingtoolsdir.xml

@@ -9 +9 @@
   <?dbhtml filename="creatingtoolsdir.html"?>
 
-  <title>Creating the $CLFS/tools Directory</title>
+  <title>Creating the ${CLFS}/tools Directory</title>
 
   <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">$CLFS/tools</filename>
+  will be installed under <filename class="directory">${CLFS}/tools</filename>
   to keep them separate from the programs compiled in <xref
   linkend="chapter-building-system"/>. The programs compiled here are
@@ -24 +24 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>install -dv $CLFS/tools</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
 
   <para>The next step is to create a <filename class="symlink">/tools</filename>
@@ -31 +31 @@
   class="username">root</systemitem> as well:</para>
 
-<screen><userinput>ln -sv $CLFS/tools /</userinput></screen>
+<screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen>
 
   <note>

final-preps/settingenviron.xml

@@ -17 +17 @@
 
 <screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal>exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash</literal>
+<literal>exec env -i HOME=${HOME} TERM=${TERM} PS1='\u:\w\$ ' /bin/bash</literal>
 EOF</userinput></screen>
 
@@ -56 +56 @@
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">$CLFS/cross-tools</filename> as soon as they are
+  <filename class="directory">/cross-tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>

final-system/common/stripping.xml

@@ -33 +33 @@
     <para os="e">Then reenter it with:</para>
 
-<screen os="f" role="nodump"><userinput>chroot $CLFS /tools/bin/env -i \
-    HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
+<screen os="f" role="nodump"><userinput>chroot ${CLFS} /tools/bin/env -i \
+    HOME=/root TERM=${TERM} PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
     /tools/bin/bash --login</userinput></screen>

introduction/common/askforhelp.xml

@@ -47 +47 @@
       </listitem>
       <listitem>
-        <para>The value of the $CLFS_HOST, $CLFS_TARGET, $BUILD32, and $BUILD64
-        environment variables.</para>
+        <para>The value of the ${CLFS_HOST}, ${CLFS_TARGET}, ${BUILD32}, and
+        ${BUILD64} environment variables.</para>
       </listitem>
       <listitem>

materials/common/introduction.xml

@@ -30 +30 @@
   that is conveniently available throughout the entire build. A working
   directory is also required to unpack the sources and build them.
-  <filename class="directory">$CLFS/sources</filename> can be used both
+  <filename class="directory">${CLFS}/sources</filename> can be used both
   as the place to store the tarballs and patches and as a working
   directory. By using this directory, the required elements will be
@@ -40 +40 @@
   starting the download session:</para>
 
-<screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
+<screen><userinput>mkdir -v ${CLFS}/sources</userinput></screen>
 
   <para>Make this directory writable and sticky. When a directory is
@@ -48 +48 @@
   write and sticky modes:</para>
 
-<screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
+<screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
 
 </sect1>

materials/common/patches.xml

@@ -155 +155 @@
 
     <varlistentry>
-      <term>Inetutils Fixes Patch - <token>&inetutils-inet_addr_fix-patch-size;</token>:</term>
+      <term>Inetutils inet_addr Patch - <token>&inetutils-inet_addr_fix-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

partitioning/common/mounting.xml

@@ -26 +26 @@
   running:</para>
 
-<screen><userinput>mkdir -pv $CLFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}
+mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
@@ -36 +36 @@
   class="directory">/usr</filename>), mount them using:</para>
 
-<screen><userinput>mkdir -pv $CLFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS
-mkdir -v $CLFS/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> $CLFS/usr</userinput></screen>
+<screen><userinput>mkdir -pv ${CLFS}
+mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}
+mkdir -v ${CLFS}/usr
+mount -v /dev/<replaceable>[yyy]</replaceable> ${CLFS}/usr</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> and

prologue/common/typography.xml

@@ -40 +40 @@
   and websites.</para>
 
-<screen role="nodump"><userinput>cat &gt; $CLFS/etc/group &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
 bin:x:1:
@@ -48 +48 @@
   <para>This format is used when creating configuration files. The first
   command tells the system to create the file
-  <filename>$CLFS/etc/group</filename> from whatever is typed on the
+  <filename>${CLFS}/etc/group</filename> from whatever is typed on the
   following lines until the sequence end of file (EOF) is encountered.
   Therefore, this entire section is generally typed as seen.</para>

temp-system/common/introduction.xml

@@ -19 +19 @@
   <para>The tools in this chapter are cross-compiled using the toolchain in
   /cross-tools and will be installed under the
-  <filename class="directory">$CLFS/tools</filename> directory to keep
+  <filename class="directory">${CLFS}/tools</filename> directory to keep
   them separate from the files installed in <xref
   linkend="chapter-building-system"/> and the host production directories.
@@ -28 +28 @@
   variable is set up properly:</para>
 
-<screen><userinput>echo $CLFS</userinput></screen>
+<screen><userinput>echo ${CLFS}</userinput></screen>
 
   <para>Make sure the output shows the path to the CLFS partition's mount

the-end/reboot.xml

@@ -37 +37 @@
   <para>Then unmount the virtual file systems:</para>
 
-<screen><userinput>umount $CLFS/dev/pts
-umount $CLFS/dev/shm
-umount $CLFS/dev
-umount $CLFS/proc
-umount $CLFS/sys</userinput></screen>
+<screen><userinput>umount ${CLFS}/dev/pts
+umount ${CLFS}/dev/shm
+umount ${CLFS}/dev
+umount ${CLFS}/proc
+umount ${CLFS}/sys</userinput></screen>
 
   <para>Unmount the CLFS file system itself:</para>
 
-<screen><userinput>umount $CLFS</userinput></screen>
+<screen><userinput>umount ${CLFS}</userinput></screen>
 
   <para>If multiple partitions were created, unmount the other
   partitions before unmounting the main one, like this:</para>
 
-<screen><userinput>umount $CLFS/usr
-umount $CLFS/home
-umount $CLFS</userinput></screen>
+<screen><userinput>umount ${CLFS}/usr
+umount ${CLFS}/home
+umount ${CLFS}</userinput></screen>
 
   <para>Now, reboot the system with:</para>