Changeset 350ab24 for BOOK/system-config

Timestamp:

Apr 28, 2014, 8:56:46 PM (12 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

Location:

BOOK/system-config

Files:

• alpha-chapter.xml (moved) (moved from BOOK/bootscripts/alpha-chapter.xml ) (1 diff)
• common/clock.xml (moved) (moved from BOOK/bootscripts/common/clock.xml )
• common/console.xml (moved) (moved from BOOK/bootscripts/common/console.xml ) (1 diff)
• common/inputrc.xml (moved) (moved from BOOK/bootscripts/common/inputrc.xml )
• common/introduction.xml (moved) (moved from BOOK/bootscripts/common/introduction.xml ) (1 diff)
• common/locale.xml (moved) (moved from BOOK/bootscripts/common/locale.xml ) (1 diff)
• common/profile.xml (moved) (moved from BOOK/bootscripts/common/profile.xml )
• common/symlinks.xml (moved) (moved from BOOK/bootscripts/common/symlinks.xml ) (1 diff)
• common/udev.xml (moved) (moved from BOOK/bootscripts/common/udev.xml ) (5 diffs)
• common/usage.xml (moved) (moved from BOOK/bootscripts/common/usage.xml ) (2 diffs)
• mips-chapter.xml (moved) (moved from BOOK/bootscripts/mips-chapter.xml ) (1 diff)
• mips64-64-chapter.xml (moved) (moved from BOOK/bootscripts/mips64-64-chapter.xml ) (1 diff)
• mips64-chapter.xml (moved) (moved from BOOK/bootscripts/mips64-chapter.xml ) (1 diff)
• ppc-chapter.xml (moved) (moved from BOOK/bootscripts/ppc-chapter.xml ) (1 diff)
• ppc64-64-chapter.xml (moved) (moved from BOOK/bootscripts/ppc64-64-chapter.xml ) (1 diff)
• ppc64-chapter.xml (moved) (moved from BOOK/bootscripts/ppc64-chapter.xml ) (1 diff)
• sparc-chapter.xml (moved) (moved from BOOK/bootscripts/sparc-chapter.xml ) (1 diff)
• sparc64-64-chapter.xml (moved) (moved from BOOK/bootscripts/sparc64-64-chapter.xml ) (1 diff)
• sparc64-chapter.xml (moved) (moved from BOOK/bootscripts/sparc64-chapter.xml ) (1 diff)
• x86-chapter.xml (moved) (moved from BOOK/bootscripts/x86-chapter.xml ) (1 diff)
• x86_64-64-chapter.xml (moved) (moved from BOOK/bootscripts/x86_64-64-chapter.xml ) (1 diff)
• x86_64-chapter.xml (moved) (moved from BOOK/bootscripts/x86_64-chapter.xml ) (1 diff)

BOOK/system-config/alpha-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/common/console.xml

@@ -17 +17 @@
   <command>systemd-vconsole-setup</command> system service which configures
   the virtual console font and console keymap.
- 
+
   The <command>systemd-vconsole-setup</command> service reads <filename>
   /etc/vconsole.conf</filename> for configuration information. Decide which

BOOK/system-config/common/introduction.xml

@@ -12 +12 @@
 
   <para>This chapter details how to finish configuring the base system.
-  Including some final configuration for Systemd and as well as locales and a
-  simple bash profile that should be suitable for most users.</para>
+  This includes some final configuration for Systemd as well as locales and
+  a simple bash profile that should be suitable for most users.</para>
 
 </sect1>

BOOK/system-config/common/locale.xml

@@ -70 +70 @@
   prior to it being added to <filename>/etc/locale.conf</filename>:</para>
 
-<screen role="nodump"><userinput>LC_ALL=[locale name] locale territory 
+<screen role="nodump"><userinput>LC_ALL=[locale name] locale territory
 LC_ALL=[locale name] locale language
 LC_ALL=[locale name] locale charmap

BOOK/system-config/common/symlinks.xml

@@ -134 +134 @@
     device.</para>
 
-    <para>More information on writing Udev rules can be found in
-    <filename>/usr/share/doc/systemd-208/udev.html</filename>.</para>
-
  </sect2>
 

BOOK/system-config/common/udev.xml

@@ -12 +12 @@
 
   <indexterm zone="ch-scripts-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>usage</secondary>
+    <primary sortas="a-systemd">Systemd</primary>
+    <secondary>udev usage</secondary>
   </indexterm>
 
@@ -93 +93 @@
 
     <sect3>
-      <title>Udev Bootscript</title>
-
-      <para>The <command>S10udev</command> initscript takes care of creating
-      device nodes when Linux is booted. The script unsets the uevent handler
-      from the default of <command>/sbin/hotplug</command>.  This is done
-      because the kernel no longer needs to call out to an external binary.
-      Instead <command>udevd</command> will listen on a netlink socket for
-      uevents that the kernel raises. Next, the bootscript copies any static
-      device nodes that exist in <filename
-      class="directory">/lib/udev/devices</filename> to <filename
-      class="directory">/dev</filename>. This is necessary because some devices,
-      directories, and symlinks are needed before the dynamic device handling
-      processes are available during the early stages of booting a system.
-      Creating static device nodes in <filename
-      class="directory">/lib/udev/devices</filename> also provides an easy
-      workaround for devices that are not supported by the dynamic device
-      handling infrastructure. The bootscript then starts the Udev daemon,
-      <command>udevd</command>, which will act on any uevents it receives.
-      Finally, the bootscript forces the kernel to replay uevents for any
-      devices that have already been registered and then waits for
-      <command>udevd</command> to handle them.</para>
-
-    </sect3>
-
-    <sect3>
       <title>Device Node Creation</title>
 
@@ -129 +104 @@
       <emphasis>0</emphasis>. The names and permissions of the nodes created
       under the <filename class="directory">/dev</filename> directory are
-      determined by rules specified in the files within the <filename
-      class="directory">/etc/udev/rules.d/</filename> directory. These are
-      numbered in a similar fashion to the CLFS-Bootscripts package. If
-      <command>udevd</command> can't find a rule for the device it is creating,
-      it will default permissions to <emphasis>660</emphasis> and ownership to
-      <emphasis>root:root</emphasis>. Documentation on the syntax of the Udev
-      rules configuration files is available in
-      <filename>/usr/share/doc/udev/writing_udev_rules/index.html</filename></para>
+      determined by rules specified in the files within the
+      <filename class="directory">/lib/udev/rules.d</filename> and <filename
+      class="directory">/etc/udev/rules.d/</filename> directories. These files
+      have names that start with numbers, and are evaluated in numerical order.
+      If <command>udevd</command> can't find a rule for the device it is
+      creating, it will default permissions to <emphasis>660</emphasis> and
+      ownership to <emphasis>root:root</emphasis>. </para>
 
     </sect3>
@@ -234 +208 @@
       sound cards available to OSS applications), configure
       <command>modprobe</command> to load the wrapper after Udev loads the
-      wrapped module. To do this, add an <quote>install</quote> line in
-      <filename>/etc/modprobe.conf</filename>. For example:</para>
+      wrapped module. To do this, add an <quote>install</quote> line to a file
+      in <filename>/etc/modprobe.d</filename>. For example:</para>
 
 <screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
     /sbin/modprobe snd-pcm-oss ; true</literal></screen>
 
-      <para>If the module in question is not a wrapper and is useful by itself,
-      configure the <command>S05modules</command> bootscript to load this
-      module on system boot. To do this, add the module name to the
-      <filename>/etc/sysconfig/modules</filename> file on a separate line.
-      This works for wrapper modules too, but is suboptimal in that case.</para>
-
     </sect3>
 
@@ -252 +220 @@
 
       <para>Either don't build the module, or blacklist it in
-      <filename>/etc/modprobe.conf</filename> file as done with the
+      <filename>/etc/modprobe.d</filename> file as done with the
       <emphasis>forte</emphasis> module in the example below:</para>
 

BOOK/system-config/common/usage.xml

@@ -12 +12 @@
 
   <indexterm zone="ch-scripts-usage">
-    <primary sortas="a-systemd-usage">Systemd usage</primary>
+    <primary sortas="a-systemd">Systemd</primary>
   <secondary>usage</secondary></indexterm>
 
@@ -22 +22 @@
     <title>Introduction to Systemd</title>
 
- 
+
     <para>Systemd is a system management daemon designed exclusively for the
     Linux kernel API. In the Linux startup process, it is the first process to

BOOK/system-config/mips-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/mips64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/mips64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/ppc-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/ppc64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up System Bootscripts</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/ppc64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/sparc-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/sparc64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/sparc64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/x86-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/x86_64-64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>

BOOK/system-config/x86_64-chapter.xml

@@ -6 +6 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Setting Up the System">
-  <?dbhtml dir="bootscripts"?>
+<chapter id="chapter-system-config" xreflabel="System Configuration">
+  <?dbhtml dir="system-config"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Setting Up the System</title>
+  <title>System Configuration</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>