Browse Source

Remove oblolete references to consolelog
Reformat udev configure command


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9726 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 13 years ago
parent
commit
6b13ebc66a
7 changed files with 46 additions and 46 deletions
  1. 0 1
      appendices/scripts.xml
  2. 12 0
      chapter01/changelog.xml
  3. 16 6
      chapter06/udev.xml
  4. 1 12
      chapter07/bootscripts.xml
  5. 15 21
      chapter07/console.xml
  6. 2 2
      general.ent
  7. 0 4
      lsb-bootscripts/README

+ 0 - 1
appendices/scripts.xml

@@ -6,7 +6,6 @@
   <!ENTITY cleanfs            SYSTEM "cleanfs.script"> 
   <!ENTITY cleanfs            SYSTEM "cleanfs.script"> 
   <!ENTITY console            SYSTEM "console.script"> 
   <!ENTITY console            SYSTEM "console.script"> 
   <!ENTITY functions          SYSTEM "functions.script"> 
   <!ENTITY functions          SYSTEM "functions.script"> 
-  <!ENTITY consolelog         SYSTEM "consolelog.script"> 
   <!ENTITY halt               SYSTEM "halt.script"> 
   <!ENTITY halt               SYSTEM "halt.script"> 
   <!ENTITY initfunctions      SYSTEM "init-functions.script"> 
   <!ENTITY initfunctions      SYSTEM "init-functions.script"> 
   <!ENTITY localnet           SYSTEM "localnet.script"> 
   <!ENTITY localnet           SYSTEM "localnet.script"> 

+ 12 - 0
chapter01/changelog.xml

@@ -37,6 +37,18 @@
 
 
 -->
 -->
 
 
+    <listitem>
+      <para>2012-02-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove oblolete references to consolelog.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Reformat udev configure command.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2012-02-01</para>
       <para>2012-02-01</para>
       <itemizedlist>
       <itemizedlist>

+ 16 - 6
chapter06/udev.xml

@@ -54,12 +54,22 @@ mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
     <para>Prepare the package for compilation:</para>
     <para>Prepare the package for compilation:</para>
 
 
 <!-- Note that "libdir=/usr/lib64" would be required for multilib. -->
 <!-- Note that "libdir=/usr/lib64" would be required for multilib. -->
-<screen><userinput remap="configure">BLKID_CFLAGS="-I/usr/include/blkid" BLKID_LIBS="-L/lib -lblkid" \
-  KMOD_CFLAGS="-I/usr/include" KMOD_LIBS="-L/lib -lkmod" ./configure \
-  --prefix=/usr --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc \
-  --libexecdir=/lib --enable-rule_generator --disable-introspection \
-  --disable-keymap --disable-gudev --with-usb-ids-path=no \
-  --with-pci-ids-path=no --with-systemdsystemunitdir=no</userinput></screen>
+<screen><userinput remap="configure">BLKID_CFLAGS="-I/usr/include/blkid"  \
+BLKID_LIBS="-L/lib -lblkid"          \
+KMOD_CFLAGS="-I/usr/include"         \
+KMOD_LIBS="-L/lib -lkmod"            \
+./configure  --prefix=/usr           \
+             --with-rootprefix=''    \
+             --bindir=/sbin          \
+             --sysconfdir=/etc       \
+             --libexecdir=/lib       \
+             --enable-rule_generator \
+             --disable-introspection \
+             --disable-keymap        \
+             --disable-gudev         \
+             --with-usb-ids-path=no  \
+             --with-pci-ids-path=no  \
+             --with-systemdsystemunitdir=no</userinput></screen>
 
 
     <variablelist>
     <variablelist>
       <title>The meaning of the new configure options</title>
       <title>The meaning of the new configure options</title>

+ 1 - 12
chapter07/bootscripts.xml

@@ -54,7 +54,7 @@
       <segtitle>Installed directories</segtitle>
       <segtitle>Installed directories</segtitle>
 
 
       <seglistitem>
       <seglistitem>
-        <seg>checkfs, cleanfs, console, consolelog, functions, halt, ifdown,
+        <seg>checkfs, cleanfs, console, functions, halt, ifdown,
         ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
         ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
         sendsignals, setclock, static, swap, sysctl, sysklogd, template,
         sendsignals, setclock, static, swap, sysctl, sysklogd, template,
         udev, and udev_retry</seg>
         udev, and udev_retry</seg>
@@ -105,17 +105,6 @@
         </listitem>
         </listitem>
       </varlistentry>
       </varlistentry>
 
 
-      <varlistentry id="consolelog-bootscripts">
-        <term><command>consolelog</command></term>
-        <listitem>
-          <para>Sets the kernel log level to control messages reaching the
-          console.</para>
-          <indexterm zone="ch-scripts-bootscripts consolelog-bootscripts">
-            <primary sortas="d-consolelog">consolelog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="functions-bootscripts">
       <varlistentry id="functions-bootscripts">
         <term><command>functions</command></term>
         <term><command>functions</command></term>
         <listitem>
         <listitem>

+ 15 - 21
chapter07/console.xml

@@ -15,29 +15,23 @@
     <secondary>configuring</secondary>
     <secondary>configuring</secondary>
   </indexterm>
   </indexterm>
 
 
-  <indexterm zone="ch-scripts-console">
-    <primary sortas="d-consolelog">consolelog</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
   <para>This section discusses how to configure the <command>console</command>
   <para>This section discusses how to configure the <command>console</command>
-  and <command>consolelog</command> bootscripts that set up the keyboard map,
-  console font and console kernel log level. If non-ASCII characters (e.g.,
-  the copyright sign, the British pound sign and Euro symbol) will not be used
-  and the keyboard is a U.S. one, much of this section can be skipped. Without
-  the configuration file, the <command>console</command> bootscript will do
-  nothing.</para>
-
-  <para>The <command>console</command>  and <command>consolelog</command>
-  scripts read the <filename>/etc/sysconfig/console</filename> file for
-  configuration information.
-  Decide which keymap and screen font will be used. Various language-specific
-  HOWTOs can also help with this, see <ulink
+  bootscript that sets up the keyboard map, console font and console kernel log
+  level. If non-ASCII characters (e.g., the copyright sign, the British pound
+  sign and Euro symbol) will not be used and the keyboard is a U.S. one, much
+  of this section can be skipped. Without the configuration file, (or 
+  equivalent settings in <filename>rc.site</filename>), the
+  <command>console</command> bootscript will do nothing.</para>
+
+  <para>The <command>console</command> script reads the
+  <filename>/etc/sysconfig/console</filename> file for configuration
+  information.  Decide which keymap and screen font will be used. Various
+  language-specific HOWTOs can also help with this, see <ulink
   url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. If still in
   url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. If still in
-  doubt, look in the <filename class="directory">/lib/kbd</filename>
-  directory for valid keymaps and screen fonts. Read
-  <filename>loadkeys(1)</filename> and <filename>setfont(8)</filename> manual
-  pages to determine the correct arguments for these programs.</para>
+  doubt, look in the <filename class="directory">/lib/kbd</filename> directory
+  for valid keymaps and screen fonts. Read <filename>loadkeys(1)</filename> and
+  <filename>setfont(8)</filename> manual pages to determine the correct
+  arguments for these programs.</para>
 
 
   <para>The <filename>/etc/sysconfig/console</filename> file should contain lines
   <para>The <filename>/etc/sysconfig/console</filename> file should contain lines
   of the form: VARIABLE="value". The following variables are recognized:</para>
   of the form: VARIABLE="value". The following variables are recognized:</para>

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120201">
-<!ENTITY releasedate "Feb 1, 2012">
+<!ENTITY version "SVN-20120202">
+<!ENTITY releasedate "Feb 2, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 0 - 4
lsb-bootscripts/README

@@ -77,10 +77,6 @@ prefixed with three red astriks.  This provides a second 'quick glance' status
 when watching the boot messages fly by. Again, the prefixes are configurable
 when watching the boot messages fly by. Again, the prefixes are configurable
 (or completely removable) in the /etc/default/rc.site file.
 (or completely removable) in the /etc/default/rc.site file.
 
 
-ConsoleLog - The sysctl script runs much earlier in the boot process, as a
-result, it negates the need for the consolelog script.  Set 'kernel.printk = X'
-in your /etc/sysctl.conf file for equivalent functionality.
-
 Complete Rewrite - That doesn't mean that code wasn't reused when possible,
 Complete Rewrite - That doesn't mean that code wasn't reused when possible,
 so to Alexander Patrakov, Archiac, Bruce Dubbs, Bryan Kadzban, Dan Nicholson,
 so to Alexander Patrakov, Archiac, Bruce Dubbs, Bryan Kadzban, Dan Nicholson,
 Gerard Beekmans, Jeremy Huntwork, Jim Gifford, Mathias Benkmans, Matthew
 Gerard Beekmans, Jeremy Huntwork, Jim Gifford, Mathias Benkmans, Matthew