Author: jim
Date: 2006-07-07 21:46:48 -0600 (Fri, 07 Jul 2006)
New Revision: 1925

Modified:
   /
   trunk/BOOK/boot/common/creatingdirs.xml
   trunk/BOOK/boot/mips/creatingdirs.xml
   trunk/BOOK/boot/mips64/creatingdirs.xml
   trunk/BOOK/boot/multilib/creatingdirs.xml
   trunk/BOOK/chroot/common/creatingdirs.xml
   trunk/BOOK/chroot/mips/creatingdirs.xml
   trunk/BOOK/chroot/mips64/creatingdirs.xml
   trunk/BOOK/chroot/multilib/creatingdirs.xml
   trunk/BOOK/introduction/common/changelog.xml
Log:
 [EMAIL PROTECTED] (orig r2021):  [EMAIL PROTECTED] | 2006-07-07 20:36:27 -0700
 Changed Creating Directories sections to use be more consistent, and use 
xincludes for the directory-creation commands



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2018
   + b6734a72-470d-0410-b049-f317dca95413:/:2021

Modified: trunk/BOOK/boot/common/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/common/creatingdirs.xml     2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/boot/common/creatingdirs.xml     2006-07-08 03:46:48 UTC (rev 
1925)
@@ -13,7 +13,7 @@
   <para os="a">It is time to create some structure in the CLFS file system. 
Create a
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
+<screen os="b"><userinput>mkdir -pv 
${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
 mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
 install -dv -m 0750 ${CLFS}/root
 install -dv -m 1777 ${CLFS}{/var,}/tmp
@@ -27,13 +27,13 @@
 mkdir -v ${CLFS}/var/{lock,log,mail,run,spool}
 mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
 
-  <para os="b">Directories are, by default, created with permission mode 755,
+  <para os="c">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
   two changes are made&mdash;one to the home directory of user
   <systemitem class="username">root</systemitem>, and another to the
   directories for temporary files.</para>
 
-  <para os="c">The first mode change ensures that not just anybody can enter
+  <para os="d">The first mode change ensures that not just anybody can enter
   the <filename class="directory">${CLFS}/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
@@ -43,7 +43,7 @@
   by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
   1777 bit mask.</para>
 
-  <sect2 os="d">
+  <sect2 os="e">
     <title>FHS Compliance Note</title>
 
     <para>The directory tree is based on the Filesystem Hierarchy Standard

Modified: trunk/BOOK/boot/mips/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/mips/creatingdirs.xml       2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/boot/mips/creatingdirs.xml       2006-07-08 03:46:48 UTC (rev 
1925)
@@ -14,25 +14,9 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
 
-<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
-install -dv ${CLFS}/media/{floppy,cdrom}
-install -dv ${CLFS}/usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr
-install -dv ${CLFS}/usr/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr/local
-install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/var/{lock,log,mail,run,spool}
-install -dv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv ${CLFS}/opt/{bin,doc,include,info}
-install -dv ${CLFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
@@ -42,14 +26,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/boot/mips64/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/mips64/creatingdirs.xml     2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/boot/mips64/creatingdirs.xml     2006-07-08 03:46:48 UTC (rev 
1925)
@@ -45,14 +45,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/boot/multilib/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/multilib/creatingdirs.xml   2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/boot/multilib/creatingdirs.xml   2006-07-08 03:46:48 UTC (rev 
1925)
@@ -14,38 +14,32 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
 
-<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
-install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+<screen os="b"><userinput>mkdir -pv 
${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt,opt}
+mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
 install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
-install -dv ${CLFS}/media/{floppy,cdrom}
-install -dv ${CLFS}/usr/{bin,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr
-install -dv ${CLFS}/usr/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${CLFS}/usr/local
-install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${CLFS}/var/{lock,log,mail,run,spool}
-install -dv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${CLFS}/opt/{bin,doc,include,info}
-install -dv ${CLFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}{/var,}/tmp -m 1777
+mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
+mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
+for dir in /usr{,/local}; do
+  ln -sv share/{man,doc,info} $dir
+done
+mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
+mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
 install -dv ${CLFS}/usr/lib/locale
 ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/chroot/common/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/common/creatingdirs.xml   2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/chroot/common/creatingdirs.xml   2006-07-08 03:46:48 UTC (rev 
1925)
@@ -30,9 +30,9 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
-  <para os="c">The first mode change ensures that not just anybody can enter
+  <para os="d">The first mode change ensures that not just anybody can enter
   the <filename class="directory">/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
@@ -44,6 +44,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/chroot/mips/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/mips/creatingdirs.xml     2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/chroot/mips/creatingdirs.xml     2006-07-08 03:46:48 UTC (rev 
1925)
@@ -14,25 +14,9 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
 
-<screen><userinput>install -dv /{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv /{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv /root -m 0750
-install -dv /tmp /var/tmp -m 1777
-install -dv /media/{floppy,cdrom}
-install -dv /usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} /usr
-install -dv /usr/share/{doc,info,locale,man}
-install -dv /usr/share/{misc,terminfo,zoneinfo}
-install -dv /usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv /usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} /usr/local
-install -dv /usr/local/share/{doc,info,locale,man}
-install -dv /usr/local/share/{misc,terminfo,zoneinfo}
-install -dv /usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv /var/{lock,log,mail,run,spool}
-install -dv /var/{opt,cache,lib/{misc,locate},local}
-install -dv /opt/{bin,doc,include,info}
-install -dv /opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+  href="../common/creatingdirs.xml"
+  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
 
    <para os="m1">These entries are needed for the RaQ2 bootloader. Only use 
these
    if you are utilizing the Colo bootloader:</para>
@@ -42,14 +26,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/chroot/mips64/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/mips64/creatingdirs.xml   2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/chroot/mips64/creatingdirs.xml   2006-07-08 03:46:48 UTC (rev 
1925)
@@ -47,14 +47,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/chroot/multilib/creatingdirs.xml
===================================================================
--- trunk/BOOK/chroot/multilib/creatingdirs.xml 2006-07-07 19:45:18 UTC (rev 
1924)
+++ trunk/BOOK/chroot/multilib/creatingdirs.xml 2006-07-08 03:46:48 UTC (rev 
1925)
@@ -38,14 +38,14 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
   href="../common/creatingdirs.xml"
-  xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
+  xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
 
 </sect1>

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml        2006-07-07 19:45:18 UTC 
(rev 1924)
+++ trunk/BOOK/introduction/common/changelog.xml        2006-07-08 03:46:48 UTC 
(rev 1925)
@@ -40,6 +40,18 @@
       <para>July 6, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[Chris] - Modified the "creating directories" sections -
+          changed multilib instructions to be consistent with the new format
+          now used for every other arch, and changed mips instructions to
+          use xincludes.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>July 6, 2006</para>
+      <itemizedlist>
+        <listitem>
           <para>[jim] - Updated Udev rules to 07062006, Fixed cdrom,
           permissions and groups.</para>
         </listitem>

-- 
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to