diff --git a/appendices/scripts.xml b/appendices/scripts.xml index 146268601..f0c5e2c96 100644 --- a/appendices/scripts.xml +++ b/appendices/scripts.xml @@ -6,7 +6,6 @@ - diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e0c67813d..2391fcf55 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,18 @@ --> + + 2012-02-02 + + + [bdubbs] - Remove oblolete references to consolelog. + + + [bdubbs] - Reformat udev configure command. + + + + 2012-02-01 diff --git a/chapter06/udev.xml b/chapter06/udev.xml index b03b394af..e779717b6 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -54,12 +54,22 @@ mknod -m0666 /lib/udev/devices/null c 1 3 Prepare the package for compilation: -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 +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 The meaning of the new configure options diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 802012b30..2ad26e814 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -54,7 +54,7 @@ Installed directories - checkfs, cleanfs, console, consolelog, functions, halt, ifdown, + checkfs, cleanfs, console, functions, halt, ifdown, ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static, swap, sysctl, sysklogd, template, udev, and udev_retry @@ -105,17 +105,6 @@ - - consolelog - - Sets the kernel log level to control messages reaching the - console. - - consolelog - - - - functions diff --git a/chapter07/console.xml b/chapter07/console.xml index cbdb2ea2f..75a3d2a25 100644 --- a/chapter07/console.xml +++ b/chapter07/console.xml @@ -15,29 +15,23 @@ configuring - - consolelog - configuring - - This section discusses how to configure the console - and consolelog 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 console bootscript will do - nothing. + 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 rc.site), the + console bootscript will do nothing. - The console and consolelog - scripts read the /etc/sysconfig/console file for - configuration information. - Decide which keymap and screen font will be used. Various language-specific - HOWTOs can also help with this, see The console script reads the + /etc/sysconfig/console file for configuration + information. Decide which keymap and screen font will be used. Various + language-specific HOWTOs can also help with this, see . If still in - doubt, look in the /lib/kbd - directory for valid keymaps and screen fonts. Read - loadkeys(1) and setfont(8) manual - pages to determine the correct arguments for these programs. + doubt, look in the /lib/kbd directory + for valid keymaps and screen fonts. Read loadkeys(1) and + setfont(8) manual pages to determine the correct + arguments for these programs. The /etc/sysconfig/console file should contain lines of the form: VARIABLE="value". The following variables are recognized: diff --git a/general.ent b/general.ent index 0167df282..5f8f948ea 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/lsb-bootscripts/README b/lsb-bootscripts/README index 93df70e58..bf6b0396d 100644 --- a/lsb-bootscripts/README +++ b/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 (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, so to Alexander Patrakov, Archiac, Bruce Dubbs, Bryan Kadzban, Dan Nicholson, Gerard Beekmans, Jeremy Huntwork, Jim Gifford, Mathias Benkmans, Matthew