diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f608b1df0..1e7a2280e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,21 @@ --> + + 2013-01-11 + + + [bdubbs] - Revised explanation for /etc/modprobe.conf. + Fixes #3270. + + + [bdubbs] - Update udev-lfs init-net-rules.sh + script for "en*" devices introduced in systemd-197. + + + + + 2013-01-09 @@ -49,7 +64,6 @@ - 2013-01-02 diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index a448f88e6..fbca889fb 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -196,11 +196,14 @@ cp -r Documentation/* /usr/share/doc/linux-&linux-version; /etc/modprobe.d/usb.conf - The /etc/modprobe.d/usb.conf file needs to be - created so that if the USB drivers (ehci_hcd, ohci_hcd and uhci_hcd) have - been built as modules, they will be loaded in the correct order; ehci_hcd - needs to be loaded prior to ohci_hcd and uhci_hcd in order to avoid a - warning being output at boot time. + Most of the time Linux modules are loaded automatically, but + sometimes it needs some specific direction. The program that loads + modules, modprobe or insmod, uses + /etc/modprobe.d/usb.conf for this purpose. This file + needs to be created so that if the USB drivers (ehci_hcd, ohci_hcd and + uhci_hcd) have been built as modules, they will be loaded in the correct + order; ehci_hcd needs to be loaded prior to ohci_hcd and uhci_hcd in order + to avoid a warning being output at boot time. Create a new file /etc/modprobe.d/usb.conf by running the following: diff --git a/general.ent b/general.ent index 710daff68..f24277b00 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index de8da51e8..de026ae17 100644 --- a/packages.ent +++ b/packages.ent @@ -540,10 +540,10 @@ - + - + diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs index c998d9e13..5978a50d9 100644 --- a/udev-lfs/Makefile.lfs +++ b/udev-lfs/Makefile.lfs @@ -5,7 +5,7 @@ SHELL=/bin/bash SYSTEMD_VERSION=197 -VERSION=197-1 +VERSION=197-2 ifeq ($(V),) VB = @ diff --git a/udev-lfs/init-net-rules.sh b/udev-lfs/init-net-rules.sh index 1e65794ab..691d93c77 100644 --- a/udev-lfs/init-net-rules.sh +++ b/udev-lfs/init-net-rules.sh @@ -2,9 +2,10 @@ # This script generates rules for persistent network device naming # Data from udev-182 75-persistent-net-generator.rules +# Updated fof udev-197 (DEVICES=en*) RULES=/etc/udev/rules.d/70-persistent-net.rules -DEVICES=$(eval echo /sys/class/net/{eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*}) +DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*}) function usage {