-config_query UDEV_PERSIST_STORAGE \
- 'Install persistent storage rules?' \
- n &&
+config_query UDEV_EXTRAS \
+ "Build extra helpers?" \
+ y &&
-config_query UDEV_PERSIST_INPUT \
- 'Install persistent input rules?' \
- n &&
+# store extras build options in a var for reuse
+local _EXTRAS_TARG="extras/cdrom_id \
+ extras/firmware extras/rule_generator" &&
-if [[ $UDEV_PERSIST_STORAGE == n ]]
-then
- config_query UDEV_EXTRAS \
- 'Build extra helpers?' \
- y
-fi &&
-
-config_query_option UDEV_DEBUG \
- 'Compile extra debugging messages?' \
- n \
- 'DEBUG=true' \
- 'DEBUG=false' &&
-
-# Store extras build options in a var for reuse
-
-local _EXTRAS_TARG="extras/cdrom_id \
- extras/firmware extras/rule_generator" &&
-
-if [[ $UDEV_EXTRAS == y || $UDEV_PERSIST_STORAGE == y ]]
-then
+if [[ $UDEV_EXTRAS == y ]]; then
_EXTRAS_TARG="$_EXTRAS_TARG extras/ata_id extras/usb_id extras/edd_id \
- extras/floppy extras/scsi_id extras/volume_id"
-elif [[ $UDEV_PERSIST_INPUT == y ]]
-then
- _EXTRAS_TARG="$_EXTRAS_TARG extras/usb_id"
-fi &&
+ extras/floppy extras/scsi_id extras/volume_id extras/usb_id"
+fi &&
-if spell_ok hotplug
-then
- message "You seem to have hotplug installed. Hotplug has been" \
- "officially\ndeprecated in favor of udev, and it is" \
- "highly recommended that\nhotplug is removed after" \
- "udev has been installed." &&
+if spell_ok hotplug; then
+ message "You seem to have hotplug installed. Hotplug has been" \
+ "officially\ndeprecated in favor of udev, and it is" \
+ "highly recommended that\nhotplug is removed after" \
+ "udev has been installed." &&
- config_query UDEV_DISPEL_HOTPLUG \
- "Dispel hotplug after udev is cast?" \
- y
+ config_query UDEV_DISPEL_HOTPLUG \
+ "Dispel hotplug after udev is cast?" \
+ y
fi
diff --git a/disk/udev/CONFLICTS b/disk/udev/CONFLICTS
index 69f30c7..0006388 100755
--- a/disk/udev/CONFLICTS
+++ b/disk/udev/CONFLICTS
@@ -1 +1 @@
-conflicts udev-old y
+conflicts udev-old y
diff --git a/disk/udev/DEPENDS b/disk/udev/DEPENDS
index e878072..a31ad8e 100755
--- a/disk/udev/DEPENDS
+++ b/disk/udev/DEPENDS
@@ -1,12 +1,12 @@
-depends gnupg &&
-depends smgl-fhs &&
+depends gnupg &&
+depends smgl-fhs &&
-optional_depends SYSTEM-LOGGER \
- "USE_LOG=true" \
- "USE_LOG=false" \
- "for logging to syslog"
+optional_depends SYSTEM-LOGGER \
+ "USE_LOG=true" \
+ "USE_LOG=false" \
+ "for logging to syslog"
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 179e256..8430579 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,5 +1,5 @@
SPELL=udev
- VERSION=124
+ VERSION=125
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -12,8 +12,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
LICENSE[0]=GPL
KEYWORDS="disk devices nodes modules"
- SHORT="Udev creates and removes device nodes"
+ SHORT="daemon that creates and removes device nodes"
cat << EOF
-Udev creates and removes device nodes in /dev, based on events the kernel
-sends out on device discovery or removal
+Udev creates and removes device nodes in /dev, based on events the kernel
sends
+out on device discovery or removal
EOF
diff --git a/disk/udev/FINAL b/disk/udev/FINAL
index 24396fd..62df534 100755
--- a/disk/udev/FINAL
+++ b/disk/udev/FINAL
@@ -1,18 +1,17 @@
-#Ensure that all groups used in 50-default.rules exist
-create_group disk
-create_group cdrom
-create_group floppy
-create_group burning
-create_group video
-create_group audio
+# ensure that all groups used in 50-default.rules exist
+create_group disk
+create_group cdrom
+create_group floppy
+create_group burning
+create_group video
+create_group audio
# dispel hotplug
-if [[ $UDEV_DISPEL_HOTPLUG == y ]]
-then
+if [[ $UDEV_DISPEL_HOTPLUG == y ]]; then
# we don't care if these fail
dispel hotplug
persistent_remove UDEV_DISPEL_HOTPLUG
-fi &&
+fi &&
# warn of coming changes
message "\n${PROBLEM_COLOR}About persistent net interfaces naming:" \
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 7d3b743..2fc58cc 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,18 @@
+2008-07-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 125, fixed long desc
+ * PRE_BUILD: makefile patch's no longer needed, cleaned up
+ * CONFIGURE: removed persistent rules configuration (installed by
def),
+ cleaned up
+ * BUILD: use correct DESTDIR instead of prefix
+ * CONFLICTS, DEPENDS, FINAL, UP_TRIGGERS, [PRE_]SUB_DEPENDS: cleaned
up
+ * INSTALL: use `install -d' instead of `mkdir -p', SPELL > SCRIPT,
+ use correct DESTDIR, removed perstitent rules installation like in
+ BUILD (they're installed by def), cleaned up
+ * udev.conf: udev rules are located now in two dirs: /etc/udev/rules.d
+ for the user-defined rules and /lib/udev/rules.d for the system ones
+ * rules/50-default.rules: removed links for non-existent input devices
+ (noted in 2.6.26, they're just /dev/pty*)
+
2008-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 124
-# pty devices
-KERNEL=="ptmx", NAME="%k", MODE="0666"
-KERNEL=="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k"
-KERNEL=="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k"
-
# vc devices
KERNEL=="vcs", NAME="vcc/0", SYMLINK="%k"
KERNEL=="vcs[0-9]*", NAME="vcc/%n", SYMLINK="%k"
diff --git a/disk/udev/udev.conf b/disk/udev/udev.conf
index 1dfcbd9..8680f17 100644
--- a/disk/udev/udev.conf
+++ b/disk/udev/udev.conf
@@ -9,10 +9,6 @@
# Specifies where to place the device nodes in the filesystem.
udev_root="/dev"
-# The name of the udev rules file or directory to look for files with
-# the suffix .rules. Multiple rule files are read in lexical order.
-udev_rules="/etc/udev/rules.d"
-
# The logging priority. Valid values are the numerical syslog priorities
# or their textual representations: err, info and debug.
udev_log="err"
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (884c8215be4ff91733bce939ca5ae7e6c15c31c9),
Vlad Glagolev, 07/22/2008