[Lunar-commits] CVS: moonbase/filesys/udev 49-udev.rules, 1.6,
1.7 BUILD, 1.17, 1.18 DETAILS, 1.52, 1.53 udev, 1.4, 1.5
Jaime Buffery
nestu at lunar-linux.org
Tue Mar 1 23:05:37 UTC 2005
Update of /var/cvs/lunar/moonbase/filesys/udev
In directory espresso.foo-projects.org:/tmp/cvs-serv32242
Modified Files:
49-udev.rules BUILD DETAILS udev
Log Message:
052 -> 054. gcc 3.3.3, glibc 2.3.2, headers 2.6.10.0
rules:
* raid support added (via new script for scripts.d)
* /dev/cdrom* symlinks. Needs some testing on ide and scsi.
Doesn't work completely well on my box, but it is harmless,
and I need feedback.
udev initscript: removed chkconfig support. It should not be added
to boot since there is already support in the mount script provided
by e2fsprogs.
Index: 49-udev.rules
===================================================================
RCS file: /var/cvs/lunar/moonbase/filesys/udev/49-udev.rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 49-udev.rules 24 Feb 2005 12:38:42 -0000 1.6
+++ 49-udev.rules 1 Mar 2005 23:05:34 -0000 1.7
@@ -144,11 +144,11 @@
# disk devices
-BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts.d/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="cdrom"
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts.d/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="disk"
+BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", PROGRAM="/etc/udev/scripts.d/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2} cdrom%e", GROUP="cdrom"
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts.d/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="disk"
-BUS="scsi", KERNEL="sr*", SYSFS{type}="5", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sr %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4}", GROUP="cdrom"
-BUS="scsi", KERNEL="sg*", SYSFS{type}="5", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sg %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4}", GROUP="cdrom"
+BUS="scsi", KERNEL="sr*", SYSFS{type}="5", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sr %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4} cdrom%e", GROUP="cdrom"
+BUS="scsi", KERNEL="sg*", SYSFS{type}="5", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sg %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4} cdrom%e", GROUP="cdrom"
## IAC, scsi devices are disks ##
BUS="scsi", KERNEL="sd*", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sd %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4}", GROUP="disk"
BUS="scsi", KERNEL="sr*", PROGRAM="/etc/udev/scripts.d/scsi-devfs.sh sr %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4}", GROUP="disk"
@@ -162,6 +162,10 @@
KERNEL="pg*", GROUP="disk"
KERNEL="microdrive*", GROUP="disk"
+# raid devices
+KERNEL="cciss!*", PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK="%k", GROUP="disk"
+KERNEL="ida!*", PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK="%k", GROUP="disk"
+KERNEL="rd!*", PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK="%k", GROUP="disk"
# loop devices
KERNEL="loop", NAME="loop/0", SYMLINK="%k", GROUP="disk"
@@ -169,14 +173,14 @@
KERNEL="loop/*", GROUP="disk"
# optical devices
-KERNEL="cdrom*", GROUP="cdrom"
-KERNEL="cdroms/*", GROUP="cdrom"
-KERNEL="cdwriter", GROUP="cdrom"
-KERNEL="sr*", GROUP="cdrom"
-KERNEL="dvd", GROUP="cdrom"
-KERNEL="rdvd", GROUP="cdrom"
-KERNEL="pcd*", GROUP="cdrom"
-KERNEL="scd*", GROUP="cdrom"
+KERNEL="cdrom*", GROUP="cdrom"
+KERNEL="cdroms/*", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="cdwriter", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="sr*", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="dvd", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="rdvd", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="pcd*", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
+KERNEL="scd*", NAME="%k", SYMLINK="cdrom%e", GROUP="cdrom"
# md block devices
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/filesys/udev/BUILD,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- BUILD 24 Feb 2005 12:38:42 -0000 1.17
+++ BUILD 1 Mar 2005 23:05:34 -0000 1.18
@@ -13,7 +13,11 @@
install ${SCRIPT_DIRECTORY}/udev /etc/init.d/ &&
install ${SCRIPT_DIRECTORY}/49-udev.rules /etc/udev/rules.d/ &&
- mkdir -p /etc/udev/scripts.d/
- install extras/{ide-devfs.sh,scsi-devfs.sh,dvb.sh} /etc/udev/scripts.d/
+
+ mkdir -p /etc/udev/scripts.d/
+ for script in ide-devfs.sh scsi-devfs.sh dvb.sh raid-devfs.sh
+ do
+ install extras/${script} /etc/udev/scripts.d/
+ done
) > $C_FIFO 2>&1
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/filesys/udev/DETAILS,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- DETAILS 24 Feb 2005 12:38:42 -0000 1.52
+++ DETAILS 1 Mar 2005 23:05:34 -0000 1.53
@@ -1,14 +1,14 @@
MODULE=udev
- VERSION=052
+ VERSION=054
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE2=scsi-devfs.sh.patch
SOURCE_URL=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
SOURCE2_URL=$PATCH_URL/
- SOURCE_VFY=sha1:b4ea3447ae147c8c7b7a006086e061ae69eafdfc
+ SOURCE_VFY=sha1:db0dc5ea7d2976adcd803fa63a8635f11910d786
SOURCE2_VFY=sha1:9fc20cdd3ae95476dc066b2ff20c167f5c41c736
WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
ENTERED=20040104
- UPDATED=20050224
+ UPDATED=20050301
PSAFE=no
SHORT="Device naming from userspace for 2.6+ kernels"
Index: udev
===================================================================
RCS file: /var/cvs/lunar/moonbase/filesys/udev/udev,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- udev 15 Jan 2005 08:47:41 -0000 1.4
+++ udev 1 Mar 2005 23:05:34 -0000 1.5
@@ -1,12 +1,6 @@
#! /bin/bash
#
-# udev init script to setup /dev
-#
-# chkconfig: 2345 20 80
-# description: manage user-space device nodes in /dev
-
-# . /etc/rc.d/init.d/functions
-
+# udev init script to setup /dev
prog=udev
sysfs_dir=/sys
@@ -74,7 +68,7 @@
make_extra_nodes () {
# there are a few things that sysfs does not export for us.
# these things go here (and remember to remove them in
- # remove_extra_nodes()
+ # remove_extra_nodes()
#
# Thanks to Gentoo for the initial list of these.
ln -snf /proc/self/fd $udev_root/fd
More information about the Lunar-commits
mailing list