aboutsummaryrefslogtreecommitdiffstats
path: root/udev-lfs
diff options
context:
space:
mode:
Diffstat (limited to 'udev-lfs')
-rw-r--r--udev-lfs/55-lfs.rules6
-rw-r--r--udev-lfs/55-lfs.txt11
-rw-r--r--udev-lfs/81-cdrom.rules3
-rw-r--r--udev-lfs/83-cdrom-symlinks.rules13
-rw-r--r--udev-lfs/ChangeLog4
-rw-r--r--udev-lfs/Makefile.lfs9
-rw-r--r--udev-lfs/README2
7 files changed, 11 insertions, 37 deletions
diff --git a/udev-lfs/55-lfs.rules b/udev-lfs/55-lfs.rules
index 34229ea2c..8d37ba920 100644
--- a/udev-lfs/55-lfs.rules
+++ b/udev-lfs/55-lfs.rules
@@ -6,9 +6,3 @@
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-lfs/55-lfs.txt b/udev-lfs/55-lfs.txt
index 5f116f9b7..6e0afda59 100644
--- a/udev-lfs/55-lfs.txt
+++ b/udev-lfs/55-lfs.txt
@@ -7,14 +7,9 @@ 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
+The RTC-related rule causes 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.
+A word of caution: A comma must separate each part of the rule. A rule can span
+multiple lines if the newline is escaped by a backslash.
diff --git a/udev-lfs/81-cdrom.rules b/udev-lfs/81-cdrom.rules
deleted file mode 100644
index cb7ea5748..000000000
--- a/udev-lfs/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-lfs/83-cdrom-symlinks.rules b/udev-lfs/83-cdrom-symlinks.rules
deleted file mode 100644
index 1a21a0649..000000000
--- a/udev-lfs/83-cdrom-symlinks.rules
+++ /dev/null
@@ -1,13 +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!="1", RUN+="/bin/false", GOTO="cd_aliases_generator_end"
-
-ENV{ID_CDROM}=="?*", PROGRAM="write_cd_rules", SYMLINK+="%c"
-
-LABEL="cd_aliases_generator_end"
diff --git a/udev-lfs/ChangeLog b/udev-lfs/ChangeLog
index 560346143..53660938a 100644
--- a/udev-lfs/ChangeLog
+++ b/udev-lfs/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-28 <bdubbs@linuxfromscratch.org>
+ * Remove obsolete 83-cdrom-symlinks.rules and 81-cdrom.rules
+ * Remove references to obsolete ISDN devices
+
2017-10-27 <bdubbs@linuxfromscratch.org>
* 83-cdrom-symlinks.rules: Adjust test for writable root directory.
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index 1218d9dcd..a8b4d7f30 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -3,7 +3,7 @@
# vim: tabstop=3
-VERSION=20171102
+VERSION=20230728
SHELL=/bin/bash
ifeq ($(V),)
@@ -16,15 +16,14 @@ all:
@echo "Use the install target"
install:
- @mkdir -pv $(DESTDIR)/lib/udev/rules.d \
+ @mkdir -pv $(DESTDIR)/usr/lib/udev/rules.d \
$(DESTDIR)/etc/udev/rules.d \
$(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
# Copy rules
@cp -v udev-lfs-$(VERSION)/*.rules $(DESTDIR)/etc/udev/rules.d
- @cp -v udev-lfs-$(VERSION)/*_rules \
- udev-lfs-$(VERSION)/init-net-rules.sh \
- udev-lfs-$(VERSION)/rule_generator.functions $(DESTDIR)/lib/udev
+ @cp -v udev-lfs-$(VERSION)/init-net-rules.sh \
+ udev-lfs-$(VERSION)/rule_generator.functions $(DESTDIR)/usr/lib/udev
# Copy documentation
@cp -v udev-lfs-$(VERSION)/README $(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
diff --git a/udev-lfs/README b/udev-lfs/README
index 61d0e86bc..1f050eb15 100644
--- a/udev-lfs/README
+++ b/udev-lfs/README
@@ -14,9 +14,7 @@ Makefile.lfs - The LFS Makefile. Installs udev rules for LFS.
contrib - Useful rules from debian
contrib/debian
-contrib/debian/83-cdrom-symlinks.rules
contrib/debian/write_cd_aliases
-contrib/debian/81-cdrom.rules
55-lfs.rules - LFS custom rules
write_net_rules - Scripts for LFS rules