Changeset 03e6a40 for BOOK/final-system/common/psmisc.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/psmisc.xml (modified) (1 diff)

BOOK/final-system/common/psmisc.xml

@@ -61 +61 @@
 
 <screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
-
-    <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
-    This usually is not a problem because it is installed later in the Sysvinit
-    package, which provides a better <command>pidof</command> program. If
-    Sysvinit will not be used for a particular system, complete the installation
-    of Psmisc by creating the following symlink:</para>
-
-<screen os="l" role="nodump"><userinput>ln -sv killall /bin/pidof</userinput></screen>
 
   </sect2>