rpms/udev/devel start_udev, 1.39, 1.40 udev.rules, 1.36, 1.37 udev.spec, 1.103, 1.104

Wed Sep 14 11:51:48 UTC 2005

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3970

Modified Files:
	start_udev udev.rules udev.spec 
Log Message:
- version 069
- updated rules file



Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40

--- start_udev	4 Aug 2005 09:01:10 -0000	1.39
+++ start_udev	14 Sep 2005 11:51:46 -0000	1.40
@@ -24,6 +24,8 @@
 
 sysfs_dir=/sys
 
+export TZ=/etc/localtime
+
 [ -d $sysfs_dir/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
 [ -x /sbin/udev ] || exit 1


Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- udev.rules	3 Aug 2005 03:01:38 -0000	1.36
+++ udev.rules	14 Sep 2005 11:51:46 -0000	1.37
@@ -3,34 +3,37 @@
 #
 # default is OWNER="root" GROUP="root", MODE="0600"
 #
+KERNEL="*", OWNER="root" GROUP="root", MODE="0600"
 
 # all block devices
 SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
+KERNEL=="root",			GROUP="disk", MODE="0640"
 
 # console devices
-KERNEL=="tty",			MODE="0666"
-KERNEL=="tty[0-9]",		GROUP="tty", MODE="0660"
-KERNEL=="tty[0-9][0-9]*",	GROUP="tty", MODE="0660"
-KERNEL=="vc/[0-9]*",		GROUP="tty", MODE="0660"
+KERNEL=="tty",			MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[0-9]",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="tty[0-9][0-9]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="vc/[0-9]*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
 
 # pty devices
 #  Set this to 0660 if you only want users belonging to tty group
 #  to be able to allocate PTYs
-KERNEL=="ptmx",			GROUP="tty", MODE="0666"
-KERNEL=="pty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660"
-KERNEL=="tty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660"
-KERNEL=="pty/m*",		GROUP="tty", MODE="0660"
-KERNEL=="vc/s*",		GROUP="tty", MODE="0660"
+KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="pty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="tty[p-za-e][0-9a-f]*",	GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="pty/m*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
+KERNEL=="vc/s*",		GROUP="tty", MODE="0660", OPTIONS="last_rule"
 
 # serial+dialup devices
-KERNEL=="ttyS*",		GROUP="uucp", MODE="0660"
+KERNEL=="ttyS*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ttyACM*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660", OPTIONS="last_rule"
 KERNEL=="ippp*",		MODE="0660"
 KERNEL=="isdn*",		MODE="0660"
 KERNEL=="isdnctrl*",		MODE="0660"
 KERNEL=="capi*",		MODE="0660"
 KERNEL=="dcbri*",		MODE="0660"
 KERNEL=="ircomm*",		GROUP="uucp", MODE="0660"
-KERNEL=="ttyUSB*",		GROUP="uucp", MODE="0660"
 KERNEL=="tts/[0-9]*",		GROUP="uucp", MODE="0660"
 KERNEL=="tts/USB[0-9]*",	GROUP="uucp", MODE="0660"
 
@@ -170,9 +173,8 @@
 BUS=="usb", KERNEL=="lp[0-9]*",	NAME="usb/%k"
 
 KERNEL=="microcode",		NAME="cpu/%k"
-# provide symlinks for backwards compatibility
-KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr", SYMLINK+="cpu/%k"
-KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpu", SYMLINK+="cpu/%k", SYMLINK+="%k"
+KERNEL="msr[0-9]*",     	NAME="cpu/%n/msr"
+KERNEL="cpu[0-9]*",     	NAME="cpu/%n/cpu"
 
 KERNEL=="ram1",			SYMLINK+="ram"
 KERNEL=="video0",		SYMLINK+="video"
@@ -235,6 +237,55 @@
 
 KERNEL=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
 
+#######################################
+# Persistant block device stuff - begin
+#######################################
+
+# Skip all of this if we are not adding a block device
+ACTION!="add",          GOTO="persistent_end"
+SUBSYSTEM!="block",     GOTO="persistent_end"
+
+# skip accessing removable ide devices, cause the ide drivers are horrible broken
+BUS=="ide", SYSFS{removable}="1", GOTO="no_volume_id"
+BUS=="ide", SYSFS{../removable}="1", GOTO="no_volume_id"
+
+# persistent disk device links /dev/disk/
+KERNEL=="hd*[!0-9]", IMPORT="/sbin/ata_id --export $tempnode"
+KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
+KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
+
+KERNEL=="sd*[!0-9]", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394'"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -s %p"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -a -s %p"
+KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+KERNEL=="sd*[0-9]", IMPORT{parent}=="ID_*"
+KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
+
+# Skip id for ram / loop / fd
+KERNEL=="ram*", GOTO="no_volume_id"
+KERNEL=="loop*", GOTO="no_volume_id"
+KERNEL=="fd*", GOTO="no_volume_id"
+
+KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
+
+# volume-label/uuid
+KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="no_volume_id"
+KERNEL=="sr*", GOTO="no_volume_id"
+KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
+KERNEL=="*[0-9]", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
+KERNEL=="*[0-9]", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+LABEL="no_volume_id"
+
+LABEL="persistent_end"
+
+#####################################
+# Persistant block device stuff - end
+#####################################
+
+
 
 # Perhaps this should just be for all subsystems?
 


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- udev.spec	4 Aug 2005 15:12:14 -0000	1.103
+++ udev.spec	14 Sep 2005 11:51:46 -0000	1.104
@@ -6,8 +6,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 063
-Release: 6
+Version: 069
+Release: 1
 License: GPL
 Group: System Environment/Base
 %if !%{with_persistent}
@@ -39,6 +39,7 @@
 Source30: firmware_helper.c
 
 Patch1: udev-062-build.patch
+Patch2: udev-069-install.patch
 Patch50: udev-039-scsi_id-tmp_dir.patch
 
 ExclusiveOS: Linux
@@ -75,7 +76,8 @@
 %prep
 %setup -q  
 
-%patch1 -p1 -b .build
+#%patch1 -p1 -b .build
+%patch2 -p1 -b .mkinst
 %patch50 -p1 -b .tmp_dir
 
 cp %{SOURCE21} .
@@ -87,6 +89,7 @@
         USE_KLIBC=false \
         USE_SELINUX=true \
 	USE_STATIC=true \
+	STRIP="/bin/true"  \
 	udevdir="/dev" \
 	USE_LOG=false DEBUG=%{debug} \
 	EXTRAS="extras/scsi_id extras/ata_id \
@@ -104,9 +107,9 @@
 	udevdir="/dev" \
 	USE_LOG=true		\
 	DEBUG=%{debug}		\
+	STRIP="/bin/true"  \
 	EXTRAS="	\
         extras/scsi_id  \
-        extras/chassis_id  \
         extras/ata_id \
 	extras/usb_id \
 %ifarch s390 s390x
@@ -126,7 +129,6 @@
 make DESTDIR=$RPM_BUILD_ROOT install \
 	EXTRAS="	\
 	extras/scsi_id	\
-	extras/chassis_id \
         extras/ata_id \
 	extras/usb_id \
 %ifarch s390 s390x
@@ -230,7 +232,6 @@
 #%attr(755,root,root) /sbin/udev_volume_id
 %attr(0755,root,root) /sbin/udev_run_devd
 %attr(0755,root,root) /sbin/udev_run_hotplugd
-%attr(755,root,root) /sbin/chassis_id
 %attr(755,root,root) /sbin/scsi_id
 %attr(755,root,root) /sbin/scsi_id.static
 %attr(755,root,root) /sbin/ata_id
@@ -244,6 +245,8 @@
 %attr(0755,root,root) %{_bindir}/udevtest
 %attr(0755,root,root) %{_bindir}/udevinfo
 
+%attr(0755,root,root) %{_sbindir}/udevmonitor
+
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
 %attr(0755,root,root) %dir %{_sysconfdir}/udev/scripts/
@@ -289,6 +292,9 @@
 %endif
 
 %changelog
+* Wed Sep 14 2005 Harald Hoyer <harald at redhat.com> - 069-1
+- version 069
+
 * Thu Aug 04 2005 Harald Hoyer <harald at redhat.com> - 063-6
 - compile with pie .. again... (#158935)
 - fixed typo in echo (#138509)


