aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bootscripts/lfs/init.d/rc2
-rw-r--r--bootscripts/lfs/sysconfig/rc.site2
-rw-r--r--chapter01/changelog.xml9
-rw-r--r--general.ent4
-rw-r--r--packages.ent2
-rw-r--r--udev-config/55-lfs.rules14
-rw-r--r--udev-config/ChangeLog254
-rw-r--r--udev-config/Makefile28
-rw-r--r--udev-config/contrib/debian/81-cdrom.rules3
-rw-r--r--udev-config/contrib/debian/83-cdrom-symlinks.rules12
-rw-r--r--udev-config/contrib/debian/write_cd_aliases111
-rw-r--r--udev-config/doc/55-lfs.txt20
-rw-r--r--udev-config/doc/README6
13 files changed, 14 insertions, 453 deletions
diff --git a/bootscripts/lfs/init.d/rc b/bootscripts/lfs/init.d/rc
index 009442f1f..a76a140a5 100644
--- a/bootscripts/lfs/init.d/rc
+++ b/bootscripts/lfs/init.d/rc
@@ -25,7 +25,7 @@ print_error_msg()
MSG="${MSG}If you're able to track this error down to a bug in one of\n"
MSG="${MSG}the files provided by the files provided by\n"
- MSG="${MSG}the ${DISDRI_MINI} book, please be so kind to inform us at\n"
+ MSG="${MSG}the ${DISDRO_MINI} book, please be so kind to inform us at\n"
MSG="${MSG}${DISTRO_CONTACT}.\n"
log_failure_msg "${MSG}"
diff --git a/bootscripts/lfs/sysconfig/rc.site b/bootscripts/lfs/sysconfig/rc.site
index f0c37eecb..3b58035b2 100644
--- a/bootscripts/lfs/sysconfig/rc.site
+++ b/bootscripts/lfs/sysconfig/rc.site
@@ -33,7 +33,7 @@
#WARNING_PREFIX="${WARNING} *** ${NORMAL}"
# Interactive startup
-#IPROMPT="yes" # Whether to display the interactive boot promp
+#IPROMPT="yes" # Whether to display the interactive boot prompt
#itime="3" # The amount of time (in seconds) to display the prompt
# The total length of the distro welcome string, without escape codes
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 962f3de67..a63f81f41 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>2012-08-31</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Fix spelling typos in bootscripts.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-08-29</para>
<itemizedlist>
<listitem>
diff --git a/general.ent b/general.ent
index 3fc1e5cb5..5df6c7bad 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120829">
-<!ENTITY releasedate "August 29, 2012">
+<!ENTITY version "SVN-20120831">
+<!ENTITY releasedate "August 31, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index ed9a678da..24a0833de 100644
--- a/packages.ent
+++ b/packages.ent
@@ -302,7 +302,7 @@
<!ENTITY less-ch6-du "3.8 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20120829"> <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120831"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->
diff --git a/udev-config/55-lfs.rules b/udev-config/55-lfs.rules
deleted file mode 100644
index 34229ea2c..000000000
--- a/udev-config/55-lfs.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS.
-
-# Core kernel devices
-
-# This causes the system clock to be set as soon as /dev/rtc becomes available.
-SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
-KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
-
-# Comms devices
-
-KERNEL=="ippp[0-9]*", GROUP="dialout"
-KERNEL=="isdn[0-9]*", GROUP="dialout"
-KERNEL=="isdnctrl[0-9]*", GROUP="dialout"
-KERNEL=="dcbri[0-9]*", GROUP="dialout"
diff --git a/udev-config/ChangeLog b/udev-config/ChangeLog
deleted file mode 100644
index 130678d95..000000000
--- a/udev-config/ChangeLog
+++ /dev/null
@@ -1,254 +0,0 @@
-2010-01-26 Matt Burgess <matthew@linuxfromscratch.org>
- * 55-lfs.rules: Remove lots of rules that have been merged upstream.
- * 61-cdrom.rules: Remove as upstream has a replacement.
- * doc/*: Cleanup and rewrite now that the rules are much simpler.
-
-2009-09-25 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules: Make the RTC rule (which runs setclock) work for people
- that don't use the RTC-class driver -- add another copy of the rule,
- using KERNEL=="rtc" instead of SUBSYSTEM=="rtc". Also move the ACTION
- match before the assignment to MODE.
-
-2009-05-23 Bruce Dubbs <bdubbs@linuxfromscratch.org>
- * 55-lfs.rules: Set the rtc by udev upon boot. Removed aio device from
- udev configuration so defaults are used.
-
-2009-05-16 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules: Adopt udev permissions for random, urandom, kmsg, and
- input devices (including psaux, which probably doesn't exist anymore
- anyway).
-
-2009-05-16 Matt Burgess <matthew@linuxfromscratch.org>
- * 55-lfs.rules: Remove the block rule as it was only setting
- permissions that Udev will set by default
- * 55-lfs.rules: Remove the rfcomm rule as the group it sets is already
- included in upstream's rule
- * 55-lfs-rules: Remove the tape rules as the group they sets is already
- included in upstream's rules
-
-2009-03-15 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules: Remove the ISDN-handling rules (replaced with upstream's
- version, which has a better match via SUBSYSTEM).
- * 55-lfs.rules: Replace "uucp" with "dialout" now that udev has decided
- to standardize on a Debian-like setup (uucp is for UUCP daemons to use
- for privilege separation; dialout is for users and devices).
-
-2008-12-07 Bruce Dubbs <bdubbs@linuxfromscratch.org>
- * 55-lfs.rules: Change one line to use continuation so it does
- not overflow the book's width.
-
-2008-12-07 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules: Remove several rules that are either provided by upstream,
- or that don't have any effect (there is no /dev/js or /dev/djs according
- to devices.txt).
- * 55-lfs.rules, 61-cdrom.rules: Replace ACTION=="add" with "add|change"
- everywhere, per upstream's general request.
-
-2008-11-11 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules, 61-cdrom.rules: Fix comments to use the right rule
- numbers. Thanks to Trent Shea for the fix. Closes #2278.
-
-2008-10-15 DJ Lucas <dj@linuxfromscratch.org>
- * 55-lfs.rules: Override default perms on floppy disk devices provided
- by 50-udev-default.rules. Thanks to Bruce Dubbs for the fix. Closes
- LFS ticket #2076.
-
-2008-05-21 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 81-firmware.rules, doc/81-firmware.txt: Remove. This rule is
- already handled by udev's 50-udev-default.rules file. The docs
- can be added back later if needed.
- * Makefile: Don't install the above deleted files.
- * 55-lfs.rules: Remove the device-mapper rule, since the upstream
- 50-udev-default.rules file handles it properly.
-
-2008-04-02 Bryan Kadzban <bryan@linuxfromscratch.org>
- * Makefile: Make the package DESTDIR-friendly by installing the docs
- into a fixed $(PREFIX)/share/doc/udev-config directory, instead of
- trying to figure out what version of udev was just installed.
-
-2007-10-30 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 55-lfs.rules: Since the dialout group was renamed to uucp, delete
- the rules that override upstream's assignment of the dialout group.
- Replace "dialout" with "uucp" on the remaining rules.
-
-2007-10-29 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 51-lfs.rules: Move to 55-lfs.rules.
- * doc/51-lfs.rules: Move to doc/55-lfs.rules.
-
-2007-10-27 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 25-lfs.rules: Some rules in here are duplicates of rules from udev's
- new 50-udev-defaults.rules file; remove them. Override permissions
- where needed elsewhere (and document overrides in comments).
- * 26-modprobe.rules: Provided by udev's 80-drivers.rules and built-in
- modaliases for SCSI device-type modules in 2.6.22+ kernels; remove.
-
- * 25-lfs.rules: Move to 51-lfs.rules.
- * 27-firmware.rules: Move to 81-firmware.rules.
- * 81-cdrom.rules: Move to 61-cdrom.rules.
-
- * doc/25-lfs.txt: Rename to 51-lfs.txt.
- * doc/26-modprobe.txt: Rename to 80-drivers.txt, and modify to reflect
- the upstream rules.
- * doc/27-firmware.txt: Rename to 81-firmware.txt.
- * doc/81-cdrom.txt: Rename to 61-cdrom.txt.
-
- * Makefile: Use new filenames.
-
-2007-07-31 Dan Nicholson <dnicholson@linuxfromscratch.org>
- * 25-lfs.rules: Changed the usb_device rule tto create /dev/bus/usb
- nodes if the usb_device in 2.6.22+ kernels. The rule was also changed
- to only trigger on "add" events. This change is not backwards
- compatible with older kernels.
-
-2007-06-12 Dan Nicholson <dnicholson@linuxfromscratch.org>
- * 25-lfs.rules: Fix the CPUID nodes from cpu/%n/cpu to cpu/%n/cpuid,
- which is what's expected in userspace apps such as x86info.
-
-2007-06-08 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 25-lfs.rules: Add rules for DVB devices (create nodes in /dev/dvb/)
- and floppies (create extra nodes based on CMOS type), copied from
- the SuSE rules file. Thanks to Alexander Patrakov for the bugreport.
-
-2007-03-04 Matthew Burgess <matthew@linuxfromscratch.org>
- * Makefile: Use `udevd --version' to work out what version of Udev is
- installed (requires Udev >= 106)
-
-2007-01-02 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 25-lfs.rules: Change CPU devices (cpu, msr, microcode) to be in
- /dev/cpu/ and /dev/cpu/N/, to match Documentation/devices.txt.
-
-2006-10-21 Bryan Kadzban <bryan@linuxfromscratch.org>
- * Makefile: Add a missing backslash in install-extra-doc.
-
- * 05-udev-early.rules, 60-persistent-input.rules,
- 60-persistent-storage.rules, 95-udev-late.rules: Remove. The book
- will install these files from udev's etc/udev/rules.d directory
- instead.
- * Makefile: Don't install these rules files after all. Also, only
- install corresponding docs if requested.
-
-2006-10-20 Bryan Kadzban <bryan@linuxfromscratch.org>
- * Makefile: Added; contains targets to install rules and doc files.
- From Dan Nicholson.
-
-2006-10-14 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 05-udev-early.rules, 60-persistent-storage.rules: Sync up with
- upstream sample rules files (from udev-102), except for one rule
- which is more specific in our tarball and should probably be changed
- upstream.
- * doc/60-persistent-storage.txt: Modify to match the changes. Also
- fix a couple typos.
-
- * 25-lfs.rules: Remove duplicate rules (ttyS[0-9]* is also matched by
- tty[BC...S...][0-9]*, and ttyUSB[0-9]* is in there twice).
-
- * 25-lfs.rules: Fix Alsa device KERNEL rules. Udev uses shell-style
- glob matching, not regular expressions, so the old rules would match
- nonsense device names like hw0asdf and pcmDzxcv. As long as the first
- character after the "fixed" portion was in the list, the rule would
- match; it wouldn't apply the same character range to later characters.
-
- * doc/25-lfs.txt: Add a note on interaction between permissions and
- symlinks.
-
-2006-10-09 Bryan Kadzban <bryan@linuxfromscrtach.org>
- * 25-lfs.rules: Fix fb[0-9]* device permissions (should use the default
- 0660).
-
- * doc/25-lfs.txt: Fix typo: /dev/ptmx is given mode 0666, not 0660.
- Also tweak the comment about other TTY devices.
-
-2006-10-04 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 05-udev-early.rules: Remove WAIT_FOR_SYSFS="bus" rule. With kernel
- 2.6.18, this rule is no longer required.
-
- * doc/05-udev-early.txt: Update to match.
-
-2006-09-28 Bryan Kadzban <bryan@linuxfromscratch.org>
- * doc/60-persistent-storage.txt: Explain persistent storage rules, or
- at least the parts I understand. (I don't use DASD or netblock or
- several other supported configurations.)
-
- * doc/81-cdrom.txt: Explain 81-cdrom.rules.
-
- * doc/95-udev-late.txt: Explain 95-udev-late.rules. Documentation is
- now finished.
-
-2006-09-26 Bryan Kadzban <bryan@linuxfromscratch.org>
- * doc/60-persistent-input.txt: Explain (in probably too much detail)
- 60-persistent-input.rules.
-
-2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org>
- * doc/05-udev-early.txt: Rewrap to fit 80 columns.
-
- * doc/26-modprobe.txt: Explain 26-modprobe.rules, and modaliases.
-
- * doc/27-firmware.txt: Explain 27-firmware.rules.
-
-2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org>
- * doc/25-lfs.txt: Explain 25-lfs.rules.
-
- * 25-lfs.rules: Use SYMLINK+= for isdn/capi20 also.
-
-2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org>
- * doc: New subdirectory to contain documentation of rules
- * doc/README: New file, top-level documentation
- * doc/*.txt: New documentation files, one for each rules file. Only
- 05-udev-early.txt has anything in it.
-
-2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 25-lfs.rules: Add "ignore_device" to OPTIONS for DRI devices, instead
- of setting NAME to an empty string. This matches the way we ignore
- devmapper / LVM devices.
-
-2006-09-22 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 60-persistent-input.rules, 95-udev-late.rules: Import from udev-100.
- 60-persistent-input.rules creates persistent symlinks for input
- devices, and 95-udev-late.rules enables udevmonitor.
-
- * 60-persistent-storage.rules: Replace ATTRS{../removable} with just
- ATTRS{removable} on partition devices. Replace ATTRS{removable}
- with ATTR{removable} on whole-disk devices.
-
-2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org>
- * 05-early.rules: Missed a rule in the last change. ENV{PHYSDEVBUS}
- in the rule that waits for the "bus" symlink should be replaced by
- SUBSYSTEMS.
-
-2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org>
- * Adapted rules to the new matches used in udev-098 and above (e.g.,
- SYSFS becomes ATTRS). Prevents warnings, and support for the old
- matches will be removed eventually. These rules will not work with
- udev-097 and before!
- * Fixed several bugs in the rules left over from previous udev
- versions (missing commas, overwriting user symlinks using ="..."
- instead of +="...", and matching against "*" instead of "?*").
-
- * Renamed CHANGELOG to ChangeLog, started using pseudo-GNU-format
- entries. (See standards.info; search it for "changelog" to get
- the general gist.)
-
-dnicholson - Jul 14, 2006
- * Fixed usbdev PROGRAM so that it works with the BusyBox sh. Thanks
- to Anthony Wright.
-
-n/a - Jul 12, 2006
- * Added options so temporary nodes are not created with device-mapper
- * Adapted cdrom rules to identify CD-ROM drives correctly by adding
- SUBSYSTEM=="block" test.
- * Added simple 81-cdrom.rules file to set cdrom group ownership
-
-n/a - Jun 07, 2006
- * Removed nvidia rules
- * Removed bug reporting rule
- * Moved Debian-based persistent CD-ROM rules to contrib
- * Adapted firmware rule to udev-093
-
-n/a - May 15, 2006
- * Part one of 25-lfs.rules rewrite
- * Some minor tweaking of the layout
-
-n/a - May 12, 2006
- * Initial import of the udev-config directory.
- * Reorganized and modularized the rules files.
- * Added explanatory comments
diff --git a/udev-config/Makefile b/udev-config/Makefile
deleted file mode 100644
index aa9dad742..000000000
--- a/udev-config/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Makefile to install udev rules and documentation
-
-PREFIX = /usr
-RULES_DIR = /etc/udev/rules.d
-INSTALL = install
-INSTALL_DATA = $(INSTALL) -m644
-RULES_FILES = \
- 55-lfs.rules
-DOC_FILES = $(RULES_FILES:.rules=.txt)
-
-# Location to install the docs
-DOC_DIR = $(PREFIX)/share/doc/udev-config
-
-all:
-
-install: install-rules
-
-install-rules:
- $(INSTALL) -d $(DESTDIR)$(RULES_DIR)
- for rule in $(RULES_FILES); do \
- $(INSTALL_DATA) $$rule $(DESTDIR)$(RULES_DIR) || exit 1; \
- done;
-
-install-doc:
- $(INSTALL) -d $(DESTDIR)$(DOC_DIR)
- for doc in $(DOC_FILES); do \
- $(INSTALL_DATA) doc/$$doc $(DESTDIR)$(DOC_DIR) || exit 1; \
- done
diff --git a/udev-config/contrib/debian/81-cdrom.rules b/udev-config/contrib/debian/81-cdrom.rules
deleted file mode 100644
index cb7ea5748..000000000
--- a/udev-config/contrib/debian/81-cdrom.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions and get device capabilities
-
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"
diff --git a/udev-config/contrib/debian/83-cdrom-symlinks.rules b/udev-config/contrib/debian/83-cdrom-symlinks.rules
deleted file mode 100644
index 4713c0b92..000000000
--- a/udev-config/contrib/debian/83-cdrom-symlinks.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/udev/rules.d/83-cdrom-symlinks.rules: Determine CD drive capability.
-
-ACTION!="add", GOTO="cd_aliases_generator_end"
-SUBSYSTEM!="block", GOTO="cd_aliases_generator_end"
-ENV{GENERATED}=="?*", GOTO="cd_aliases_generator_end"
-
-# Fail the uevent if the autogenerated rules cannot be saved
-ENV{ID_CDROM}=="?*", PROGRAM="/bin/grep -c ' / [^[:space:]]* rw' /proc/mounts", RESULT!="2", RUN+="/bin/false", GOTO="cd_aliases_generator_end"
-
-ENV{ID_CDROM}=="?*", PROGRAM="write_cd_aliases", SYMLINK+="%c"
-
-LABEL="cd_aliases_generator_end"
diff --git a/udev-config/contrib/debian/write_cd_aliases b/udev-config/contrib/debian/write_cd_aliases
deleted file mode 100644
index 6443b6dcf..000000000
--- a/udev-config/contrib/debian/write_cd_aliases
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh -e
-
-RULES_FILE="/etc/udev/rules.d/82-persistent-cd.rules"
-
-##############################################################################
-lock_rules_file() {
- RULES_LOCK="/dev/.udev/.lock-${RULES_FILE##*/}"
-
- retry=30
- while ! mkdir $RULES_LOCK 2> /dev/null; do
- if [ $retry -eq 0 ]; then
- echo "Cannot lock $RULES_FILE!" >&2
- exit 2
- fi
- sleep 1
- retry=$(($retry - 1))
- done
-}
-
-unlock_rules_file() {
- rmdir $RULES_LOCK || true
-}
-
-##############################################################################
-find_next_available() {
- # use echo to convert newlines to spaces
- local links=`echo $(find_all_symlinks $1)`
- local basename=${links%%[ 0-9]*}
- local max=-1
- for name in $links; do
- local num=${name#$basename}
- [ "$num" ] || num=0
- [ $num -gt $max ] && max=$num
- done
-
- max=$(($max + 1))
- # "name0" actually is just "name"
- [ $max -eq 0 ] && return
- echo "$max"
-}
-
-find_all_symlinks() {
- local linkre="$1"
- local match="$2"
-
- [ -e $RULES_FILE ] || return
-
- local search='.*[[:space:],]SYMLINK+="\('"$linkre"'\)"[[:space:]]*\(,.*\|\\\|\)$'
-
- sed -n -e "${match}s/${search}/\1/p" $RULES_FILE
-}
-
-write_rule() {
- local match="$1"
- local link="$2"
- local comment="$3"
-
- [ -e "$RULES_FILE" ] || PRINT_HEADER=1
- {
- if [ "$PRINT_HEADER" ]; then
- PRINT_HEADER=
- echo "# This file was automatically generated by the $0"
- echo "# program, probably run by the 83-cdrom.rules rules file."
- echo "#"
- echo "# You can modify it, as long as you keep each rule on a single line"
- echo "# and set the \$GENERATED variable."
- echo ""
- fi
-
- [ "$comment" ] && echo "# $comment"
- echo "ACTION==\"add\", SUBSYSTEM==\"block\", $match, ENV{ID_CDROM}==\"1\", SYMLINK+=\"$link\", ENV{GENERATED}=\"1\""
- } >> $RULES_FILE
- SYMLINKS="$SYMLINKS $link"
-}
-
-##############################################################################
-if [ -z "$DEVPATH" ]; then
- echo "Missing \$DEVPATH." >&2
- exit 1
-fi
-if [ -z "$ID_CDROM" ]; then
- echo "$DEVPATH is not a CD reader." >&2
- exit 1
-fi
-
-# Prevent parallel processes from modifying the file at the same time.
-lock_rules_file
-
-link_num=$(find_next_available 'cdrom[0-9]*')
-
-#match="ENV{ID_PATH}==\"$ID_PATH\""
-
-#kernel=${DEVPATH##*/}
-#match="KERNEL==\"$kernel\""
-
-id=${PHYSDEVPATH##*/}
-match="BUS==\"$PHYSDEVBUS\", ID==\"$id\""
-
-comment="$ID_MODEL ($ID_PATH)"
-
- write_rule "$match" "cdrom$link_num" "$comment"
-[ "$ID_CDROM_CD_RW" ] && write_rule "$match" "cdrw$link_num"
-[ "$ID_CDROM_DVD" ] && write_rule "$match" "dvd$link_num"
-[ "$ID_CDROM_DVD_RW" ] && write_rule "$match" "dvdrw$link_num"
-
-unlock_rules_file
-
-echo $SYMLINKS
-
-exit 0
-
diff --git a/udev-config/doc/55-lfs.txt b/udev-config/doc/55-lfs.txt
deleted file mode 100644
index 5f116f9b7..000000000
--- a/udev-config/doc/55-lfs.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Purpose of rules file:
-
-Most of the rules installed by Udev itself create devices with the correct
-properties. This file contains rules that have not been merged upstream yet.
-
-Description of rules:
-
-By default, Udev creates device nodes with UID 0, GID 0, and permissions 0660.
-
-ISDN-related devices should be owned by the 'dialout' group, hence the following
-rule (and similar):
-
-KERNEL=="ippp[0-9]*", GROUP="dialout"
-
-The RTC-related rules cause the setclock bootscript to be run as soon as the
-RTC device has been created by Udev, meaning that times in log files, for
-example, are as accurate as possible as quickly as possible.
-
-A final word of caution: Any particular rule must be written on one line, and a
-comma must separate each part of the rule.
diff --git a/udev-config/doc/README b/udev-config/doc/README
deleted file mode 100644
index 01216694c..000000000
--- a/udev-config/doc/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains documentation for each rule file used in LFS.
-
-Each .rules file should contain a corresponding .txt file in this directory,
-which explains both the overall purpose of the rules file, and each type of
-rule contained therein.
-