Changeset 03e6a40 for BOOK/final-system/common/kmod.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 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/final-system/common/kmod.xml (modified) (3 diffs)

BOOK/final-system/common/kmod.xml

@@ -31 +31 @@
 <screen os="b"><userinput>./configure --prefix=/usr \
     --bindir=/bin --sysconfdir=/etc \
-    --with-rootlibdir=/lib --disable-manpages \
+    --with-rootlibdir=/lib \
     --with-zlib --with-xz</userinput></screen>
 
@@ -70 +70 @@
 
 <screen os="j"><userinput>ln -sfv kmod /bin/lsmod
-ln -sfv ../bin/kmod /sbin/depmod
-ln -sfv ../bin/kmod /sbin/insmod
-ln -sfv ../bin/kmod /sbin/modprobe
-ln -sfv ../bin/kmod /sbin/modinfo
-ln -sfv ../bin/kmod /sbin/rmmod</userinput></screen>
+for tool in depmod insmod modprobe modinfo rmmod; do
+ln -sfv ../bin/kmod /sbin/${tool}
+done</userinput></screen>
   
   </sect2>
@@ -85 +83 @@
 
       <seglistitem>
-        <seg>depmod, insmod, kmod, lsmod, modinfo, modprobe, and
-        rmmod</seg>
+        <seg>depmod (link to kmod), insmod (link to kmod), kmod,
+        lsmod (link to kmod), modinfo (link to kmod), modprobe (link to kmod),
+        and rmmod (link to kmod) </seg>
       </seglistitem>
     </segmentedlist>