rpms/udev/devel udev-039-scsi_id-tmp_dir.patch, NONE, 1.1 udev.rules, 1.24, 1.25 udev.rules.persistent, 1.4, 1.5 udev.spec, 1.88, 1.89
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 12 10:19:26 UTC 2005
- Previous message (by thread): rpms/htmlview/devel htmlview,1.11,1.12 htmlview.spec,1.18,1.19
- Next message (by thread): rpms/postfix/devel .cvsignore, 1.13, 1.14 postfix.spec, 1.28, 1.29 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8324
Modified Files:
udev.rules udev.rules.persistent udev.spec
Added Files:
udev-039-scsi_id-tmp_dir.patch
Log Message:
polished persistent
udev-039-scsi_id-tmp_dir.patch:
scsi_id.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE udev-039-scsi_id-tmp_dir.patch ---
--- udev-039/extras/scsi_id/scsi_id.c.scsi_id-tmp_dir 2004-10-16 07:08:30.000000000 +0900
+++ udev-039/extras/scsi_id/scsi_id.c 2005-03-10 17:34:36.000000000 +0900
@@ -44,8 +44,8 @@
/*
* temporary names for mknod.
*/
-#define TMP_DIR "/tmp"
-#define TMP_PREFIX "scsi"
+#define TMP_DIR "/dev"
+#define TMP_PREFIX "tmp-scsi"
/*
* XXX Note the 'e' (send output to stderr in all cases), and 'c' (callout)
Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- udev.rules 21 Apr 2005 13:11:33 -0000 1.24
+++ udev.rules 12 May 2005 10:19:24 -0000 1.25
@@ -119,7 +119,7 @@
KERNEL=="v4l/*", MODE="0660"
# input devices
-KERNEL=="input/*", MODE="0644"
+KERNEL=="input/*", MODE="0660"
# gpm devices
KERNEL=="gpmctl", MODE="0700"
@@ -198,8 +198,15 @@
KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK="tape%e"
KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK="tape%e"
-KERNEL="umad*", NAME="infiniband/%k"
-KERNEL="issm*", NAME="infiniband/%k"
+KERNEL=="umad*", NAME="infiniband/%k"
+KERNEL=="issm*", NAME="infiniband/%k"
+
+# Section for zaptel device
+KERNEL=="zapctl", NAME="zap/ctl"
+KERNEL=="zaptimer", NAME="zap/timer"
+KERNEL=="zapchannel", NAME="zap/channel"
+KERNEL=="zappseudo", NAME="zap/pseudo"
+KERNEL=="zap[0-9]*", NAME="zap/%n"
# do not seperate the next 2 lines!!
KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/etc/udev/scripts/ide-media.sh %k", RESULT=="floppy", SYMLINK="floppy%e", NAME{ignore_remove, all_partitions}="%k"
Index: udev.rules.persistent
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules.persistent,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev.rules.persistent 6 Oct 2004 15:39:59 -0000 1.4
+++ udev.rules.persistent 12 May 2005 10:19:24 -0000 1.5
@@ -1,18 +1,18 @@
-BUS="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
-BUS="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
-BUS="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh", NAME="%k" SYMLINK="%c{1+}"
+BUS=="scsi", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
+BUS=="usb", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
+BUS=="ide", PROGRAM="/sbin/udev.get_persistent_device_name.sh", SYMLINK="%c{1+}"
# S/390 zfcp, full disk
-BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun} disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
+BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[!0-9]", SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun} disk/by-serial/fcp-%c{1}%c{2}-%c{3}"
# S/390 zfcp, disk partition
-BUS="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
+BUS=="ccw", PROGRAM="/sbin/scsi_id" SYSFS{cutype}="1731/03" SYSFS{devtype}="1732/03" KERNEL="sd*[0-9]", SYMLINK="disk/by-path/ccw-%s{hba_id}-fcp-%s{wwpn}:%s{fcp_lun}-part%n disk/by-serial/fcp-%c{1}%c{2}-%c{3}-part%n"
# S/390 DASD, full disk
-BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%b"
+BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[!0-9]", SYMLINK="disk/by-path/ccw-%b"
# S/390 DASD, disk partition
-BUS="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]", NAME="%k" SYMLINK="disk/by-path/ccw-%b-part%n"
+BUS=="ccw", SYSFS_discipline="ECKD" KERNEL="dasd*[0-9]", SYMLINK="disk/by-path/ccw-%b-part%n"
# KERNEL="ntibm*[0-9]", SYMLINK="tape/%b/non-rewinding"
# KERNEL="rtibm*[0-9]", SYMLINK="tape/%b/rewinding"
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- udev.spec 6 May 2005 01:37:56 -0000 1.88
+++ udev.spec 12 May 2005 10:19:24 -0000 1.89
@@ -4,11 +4,10 @@
%define with_persistent 0
-
Summary: A userspace implementation of devfs
Name: udev
Version: 057
-Release: 5
+Release: 6
License: GPL
Group: System Environment/Base
%if !%{with_persistent}
@@ -41,6 +40,7 @@
Patch1: udev-039-static.patch
Patch4: udev-056-selinux.patch
+Patch50: udev-039-scsi_id-tmp_dir.patch
ExclusiveOS: Linux
URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -78,14 +78,13 @@
#%patch1 -p1 -b .glibcstatic
%patch4 -p1 -b .selinux
+%patch50 -p1 -b .tmp_dir
touch etc/init.d/udev.debian
-%if %{with_persistent}
mkdir ata_identify
cp %{SOURCE11} ata_identify
cp %{SOURCE12} ata_identify/Makefile
-%endif
cp %{SOURCE21} .
@@ -98,11 +97,12 @@
USE_STATIC=true \
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
- EXTRAS="extras/scsi_id" all
+ EXTRAS="extras/scsi_id ata_identify" all
mv udev udev.static
mv udevstart udevstart.static
mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
+mv ata_identify/ata_identify ata_identify/ata_identify.static
make clean
make CC="gcc $RPM_OPT_FLAGS" \
@@ -114,11 +114,7 @@
EXTRAS=" \
extras/scsi_id \
extras/chassis_id \
-%if %{with_persistent}
ata_identify"
-%else
- "
-%endif
#extras/volume_id
%install
@@ -130,15 +126,12 @@
EXTRAS=" \
extras/scsi_id \
extras/chassis_id \
-%if %{with_persistent}
ata_identify"
-%else
- "
-%endif
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.rules
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/udev
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d/default/10-udev.hotplug
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts,devices,makedev.d}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
@@ -154,13 +147,14 @@
install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
install -m 0755 udevstart.static $RPM_BUILD_ROOT/sbin/udevstart.static
install -m 0755 extras/scsi_id/scsi_id.static $RPM_BUILD_ROOT/sbin/scsi_id.static
+install -m 0755 ata_identify/ata_identify.static $RPM_BUILD_ROOT/sbin/ata_identify.static
%if %{with_persistent}
#persistent
install -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/sbin
install -m 0755 %{SOURCE14} $RPM_BUILD_ROOT/sbin
install -m 0755 %{SOURCE15} $RPM_BUILD_ROOT/sbin
-install -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-udev-persistent.rules
+install -m 0644 %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/49-udev-persistent.rules
#install -m 0644 extras/volume_id/s390-dasd.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
%endif
@@ -228,9 +222,12 @@
%attr(0755,root,root) /sbin/udevstart
%attr(0755,root,root) /sbin/udevstart.static
%attr(0755,root,root) /sbin/start_udev
-%if %{with_persistent}
-%attr(755,root,root) /sbin/ata_identify
-%endif
+%attr(0755,root,root) /sbin/ata_identify
+%attr(0755,root,root) /sbin/ata_identify.static
+#%attr(755,root,root) /sbin/udev_volume_id
+%attr(755,root,root) /sbin/chassis_id
+%attr(755,root,root) /sbin/scsi_id
+%attr(755,root,root) /sbin/scsi_id.static
%attr(0755,root,root) %{_bindir}/udevtest
%attr(0755,root,root) %{_bindir}/udevinfo
@@ -266,29 +263,25 @@
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
-
-%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
+#%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
%attr(0644,root,root) %{_mandir}/man8/udev*.8*
-
-
-%attr(755,root,root) /sbin/scsi_id
-%attr(755,root,root) /sbin/scsi_id.static
-%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
-#%attr(755,root,root) /sbin/udev_volume_id
-%attr(755,root,root) /sbin/chassis_id
%if %{with_persistent}
%files -n udev-persistent
-%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/51-udev-persistent.rules
+%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/49-udev-persistent.rules
%attr(0755,root,root) /sbin/udev.get_persistent_device_name.sh
%attr(0755,root,root) /sbin/udev.get_unique_hardware_path.sh
%attr(0755,root,root) /sbin/udev.get_unique_drive_id.sh
-%attr(0644,root,root) %{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
+#%attr(0644,root,root) %{_sysconfdir}/udev/rules.d/52-udev-s390-persistent.rules
%endif
%changelog
+* Thu May 12 2005 Harald Hoyer <harald at redhat.com> - 057-6
+- polished persistent scripts
+
* Thu May 5 2005 Bill Nottingham <notting at redhat.com> - 057-5
- rebuild
- Previous message (by thread): rpms/htmlview/devel htmlview,1.11,1.12 htmlview.spec,1.18,1.19
- Next message (by thread): rpms/postfix/devel .cvsignore, 1.13, 1.14 postfix.spec, 1.28, 1.29 sources, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list