Changeset 03e6a40 for BOOK/chroot/common/creatingdirs.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/chroot/common/creatingdirs.xml (modified) (3 diffs)

BOOK/chroot/common/creatingdirs.xml

@@ -13 +13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
   href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
+  xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
+<screen os="c"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
 mkdir -pv /{proc,media/{floppy,cdrom},run/shm,sbin,srv,sys}
 mkdir -pv /var/{lock,log,mail,spool}
@@ -24 +24 @@
 mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
+mkdir -pv /usr/{,local/}share/man/man{1..8}</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41 +34 @@
   xpointer="xpointer(//*[@os='e'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../boot/common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
 </sect1>