|
|
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16531
Modified Files:
start_udev udev.rules udev.spec
Log Message:
- moved /etc/udev/scripts to /lib/udev
- moved /etc/udev/devices to /lib/udev/devices
- added new event replay for kernel >= 2.6.15
- added usb devices
- renamed cpu device to cpuid (bug #161538)
- changed vendor string "Onstream" to "On[sS]tream" (bug #173043)
- compiled all *_id programs statically
Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- start_udev 25 Oct 2005 11:21:26 -0000 1.41
+++ start_udev 14 Nov 2005 17:42:04 -0000 1.42
@@ -85,15 +85,18 @@
fi
done
fi
- pushd /etc/udev/devices &> "$udev_root/null"
- set *
- if [ "$1" != "*" ]; then
- cp -ar "$@" $udev_root/
- pushd "$udev_root" &> "$udev_root/null"
- [ -x /sbin/restorecon ] && /sbin/restorecon "$@"
+ for devdir in /etc/udev/devices /lib/udev/devices; do
+ [ -d "$devdir" ] || continue
+ pushd $devdir &> "$udev_root/null"
+ set *
+ if [ "$1" != "*" ]; then
+ cp -ar "$@" $udev_root/
+ pushd "$udev_root" &> "$udev_root/null"
+ [ -x /sbin/restorecon ] && /sbin/restorecon "$@"
+ popd &> "$udev_root/null"
+ fi
popd &> "$udev_root/null"
- fi
- popd &> "$udev_root/null"
+ done
}
# we cannot use /usr/bin/find here
@@ -186,6 +189,44 @@
return 0
}
+event_replay () {
+ # generate events with the sysfs trigger
+ list=$(echo /sys/bus/*/devices/*/uevent)
+ list="$list $(echo /sys/class/*/*/uevent)"
+ list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
+ for i in $list; do
+ case "$i" in
+ */device/uevent)
+ # skip followed device symlinks
+ continue
+ ;;
+ */class/mem/*|*/class/tty/*)
+ first="$first $i"
+ ;;
+ */block/md*)
+ last="$last $i"
+ ;;
+ */*)
+ default="$default $i"
+ ;;
+ esac
+ done
+
+ # trigger the sorted events
+ set $first $default $last
+ if [ $# -gt 1 ]; then
+ echo -e '\000' > /proc/sys/kernel/hotplug
+ for i in $@; do
+ echo "add" > "$i"
+ done
+ else
+ scsi_replay > "$udev_root/null" 2>&1
+ ide_scan > "$udev_root/null" 2>&1
+ return /sbin/udevstart
+ fi
+ return 0
+}
+
export ACTION=add
prog=udev
@@ -218,15 +259,11 @@
ret=$[$ret + $?]
}
-
rm -fr "$udev_db"
make_extra_nodes
kill_udevd > "$udev_root/null" 2>&1
udevd -d
-scsi_replay > "$udev_root/null" 2>&1
-ret=$[$ret + $?]
-ide_scan > "$udev_root/null" 2>&1
-/sbin/udevstart
+event_replay
ret=$[$ret + $?]
[ $ret -eq 0 ] && success $"$STRING" || failure $"$STRING"
echo
Index: udev.rules
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.rules,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- udev.rules 25 Oct 2005 11:21:26 -0000 1.44
+++ udev.rules 14 Nov 2005 17:42:04 -0000 1.45
@@ -179,7 +179,7 @@
KERNEL=="microcode", NAME="cpu/%k"
KERNEL="msr[0-9]*", NAME="cpu/%n/msr"
-KERNEL="cpu[0-9]*", NAME="cpu/%n/cpu"
+KERNEL="cpu[0-9]*", NAME="cpu/%n/cpuid"
KERNEL=="ram1", SYMLINK+="ram"
KERNEL=="video0", SYMLINK+="video"
@@ -223,24 +223,24 @@
BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k",
SYMLINK="scanner%e", MODE="0660"
# 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"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e",
NAME{ignore_remove, all_partitions}="%k"
KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom",
SYMLINK+="cdrom%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k
DVD", SYMLINK+="dvd%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD",
SYMLINK+="dvd%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k
CD-R", SYMLINK+="cdwriter%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R",
SYMLINK+="cdwriter%e"
-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM="/etc/udev/scripts/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/etc/udev/scripts/check-cdrom.sh %k
DVD-R", SYMLINK+="dvdwriter%e"
+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1",
PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R",
SYMLINK+="dvdwriter%e"
# rename sr* to scd*
KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n"
KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k"
-KERNEL=="dvb*", PROGRAM=="/etc/udev/scripts/dvb.sh %k", NAME="%c"
+KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
#######################################
# Persistent block device stuff - begin
@@ -296,6 +296,7 @@
# Persistent block device stuff - end
#####################################
+ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k
X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
# Perhaps this should just be for all subsystems?
@@ -318,11 +319,11 @@
RUN+="/sbin/modprobe sd_mod"
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
RUN+="/sbin/modprobe sr_mod"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream",
\
+ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1",
SYSFS{vendor}=="On[sS]tream", \
SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream",
\
+ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1",
SYSFS{vendor}=="On[sS]tream", \
SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream",
\
+ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1",
SYSFS{vendor}!="On[sS]tream", \
RUN+="/sbin/modprobe st"
ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
RUN+="/sbin/modprobe sg"
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- udev.spec 11 Nov 2005 13:26:37 -0000 1.121
+++ udev.spec 14 Nov 2005 17:42:04 -0000 1.122
@@ -2,18 +2,14 @@
%define debug false
-%define with_persistent 0
-
Summary: A userspace implementation of devfs
Name: udev
Version: 075
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Base
-%if !%{with_persistent}
Provides: udev-persistent = 0:%{version}-%{release}
Obsoletes: udev-persistent < 0:030-5
-%endif
Source:
ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2
Source1: udev.rules
Source3: udev.conf
@@ -21,10 +17,6 @@
Source5: MAKEDEV.dev
Source10: hotplug.rules
-Source13: udev.get_persistent_device_name.sh
-Source14: udev.get_unique_hardware_path.sh
-Source15: udev.get_unique_drive_id.sh
-Source16: udev.rules.persistent
Source17: check-cdrom.sh
Source18: ide-media.sh
@@ -60,17 +52,8 @@
udev is a implementation of devfs in userspace using sysfs and
/sbin/hotplug. It requires a 2.6 kernel to run properly.
-%if %{with_persistent}
-%package -n udev-persistent
-Summary: Persistent device naming with udev
-Group: Utilities/System
-PreReq: udev = 0:%{version}-%{release}
Requires: sed
-%description -n udev-persistent
-udev-persistent enables persistent device naming with udev.
-%endif
-
%define add %{nil}
%prep
@@ -89,14 +72,28 @@
STRIP="/bin/true" \
udevdir="/dev" \
USE_LOG=false DEBUG=%{debug} \
- EXTRAS="extras/scsi_id extras/ata_id extras/edd_id \
+ EXTRAS=" \
+ extras/scsi_id \
+ extras/ata_id \
+ extras/usb_id \
+ extras/edd_id \
+ extras/volume_id \
+%ifarch s390 s390x
+ extras/dasd_id \
+%endif
" all
mv udev udev.static
+mv udevd udevd.static
mv udevstart udevstart.static
mv extras/scsi_id/scsi_id extras/scsi_id/scsi_id.static
mv extras/ata_id/ata_id extras/ata_id/ata_id.static
mv extras/edd_id/edd_id extras/edd_id/edd_id.static
+%ifarch s390 s390x
+ mv extras/dasd_id/dasd_id extras/dasd_id/dasd_id.static
+%endif
+mv extras/usb_id/usb_id extras/usb_id/usb_id.static
+mv extras/volume_id/vol_id extras/volume_id/vol_id.static
make clean
make CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" \
@@ -126,6 +123,15 @@
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mv extras/scsi_id/scsi_id.static extras/scsi_id/scsi_id
+mv extras/ata_id/ata_id.static extras/ata_id/ata_id
+mv extras/edd_id/edd_id.static extras/edd_id/edd_id
+%ifarch s390 s390x
+ mv extras/dasd_id/dasd_id.static extras/dasd_id/dasd_id
+%endif
+mv extras/usb_id/usb_id.static extras/usb_id/usb_id
+mv extras/volume_id/vol_id.static extras/volume_id/vol_id
+
make DESTDIR=$RPM_BUILD_ROOT install \
EXTRAS=" \
extras/scsi_id \
@@ -144,7 +150,7 @@
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}/udev/{rules.d,makedev.d,scripts,devices}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/{default,block}
install -m 0644 %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules
@@ -154,27 +160,26 @@
install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/udev.conf
install -m 0755 udev.static $RPM_BUILD_ROOT/sbin/udev.static
+install -m 0755 udevd.static $RPM_BUILD_ROOT/sbin/udevd.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 extras/ata_id/ata_id.static $RPM_BUILD_ROOT/sbin/ata_id.static
-install -m 0755 extras/edd_id/edd_id.static $RPM_BUILD_ROOT/sbin/edd_id.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/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
+#install -m 0755 extras/scsi_id/scsi_id.static
$RPM_BUILD_ROOT/sbin/scsi_id.static
+#install -m 0755 extras/ata_id/ata_id.static $RPM_BUILD_ROOT/sbin/ata_id.static
+#install -m 0755 extras/edd_id/edd_id.static $RPM_BUILD_ROOT/sbin/edd_id.static
+#install -m 0755 extras/dasd_id/dasd_id.static
$RPM_BUILD_ROOT/sbin/dasd_id.static
+
-install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
ln -s ../../udev/scripts/pam_console.dev
$RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default/05-pam_console.dev
-install -m 0755 %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-install -m 0755 %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-install -m 0755 %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
-install -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
+
+%define udev_scriptdir /lib/udev
+
+mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices}
+install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}
+install -m 0755 %{SOURCE17} $RPM_BUILD_ROOT%{udev_scriptdir}
+install -m 0755 %{SOURCE18} $RPM_BUILD_ROOT%{udev_scriptdir}
+install -m 0755 %{SOURCE19} $RPM_BUILD_ROOT%{udev_scriptdir}
+install -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{udev_scriptdir}
+install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{udev_scriptdir}
install -m 0755 %{SOURCE22}
$RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -187,9 +192,8 @@
# floppy madness
for i in 0 1 2 3;do
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/fd$i
- ln -s ../../udev/scripts/MAKEDEV.dev
$RPM_BUILD_ROOT%{_sysconfdir}/dev.d/fd$i/10-MAKEDEV.dev
+ ln -s %{udev_scriptdir}/MAKEDEV.dev
$RPM_BUILD_ROOT%{_sysconfdir}/dev.d/fd$i/10-MAKEDEV.dev
done
-install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/scripts/
install -m 0755 firmware_helper $RPM_BUILD_ROOT/sbin
@@ -231,6 +235,7 @@
%doc etc/udev/redhat/udev.rules
%attr(0755,root,root) /sbin/udev
%attr(0755,root,root) /sbin/udev.static
+%attr(0755,root,root) /sbin/udevd.static
%attr(0755,root,root) /sbin/udevcontrol
%attr(0755,root,root) /sbin/udevsend
%attr(0755,root,root) /sbin/udevd
@@ -241,16 +246,14 @@
%attr(0755,root,root) /sbin/udev_run_devd
%attr(0755,root,root) /sbin/udev_run_hotplugd
%attr(755,root,root) /sbin/scsi_id
-%attr(755,root,root) /sbin/scsi_id.static
%attr(755,root,root) /sbin/ata_id
-%attr(755,root,root) /sbin/ata_id.static
%attr(755,root,root) /sbin/edd_id
-%attr(755,root,root) /sbin/edd_id.static
%attr(755,root,root) /sbin/usb_id
%attr(755,root,root) /sbin/vol_id
%attr(755,root,root) /sbin/path_id
%ifarch s390 s390x
%attr(755,root,root) /sbin/dasd_id
+%attr(755,root,root) /sbin/dasd_id.static
%endif
%attr(755,root,root) /sbin/firmware_helper
@@ -261,10 +264,12 @@
%attr(0755,root,root) %dir %{_sysconfdir}/udev/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/
-%attr(0755,root,root) %dir %{_sysconfdir}/udev/scripts/
-%attr(0755,root,root) %dir %{_sysconfdir}/udev/devices/
+%attr(0755,root,root) %dir %{udev_scriptdir}/
+%attr(0755,root,root) %dir %{udev_scriptdir}/devices/
+%ghost %dir %{_sysconfdir}/udev/scripts/
+%ghost %dir %{_sysconfdir}/udev/devices/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/pam_console.dev
+%attr(0755,root,root) %{udev_scriptdir}/pam_console.dev
%config(missingok) %{_sysconfdir}/dev.d/default/05-pam_console.dev
%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/default
@@ -276,12 +281,11 @@
%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/fd2
%attr(0755,root,root) %dir %{_sysconfdir}/dev.d/fd3
%config(missingok) %{_sysconfdir}/dev.d/fd?/*
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/MAKEDEV.dev
-
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/check-cdrom.sh
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/ide-media.sh
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/dvb.sh
-%attr(0755,root,root) %{_sysconfdir}/udev/scripts/udevpermconv.sh
+%attr(0755,root,root) %{udev_scriptdir}/MAKEDEV.dev
+%attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh
+%attr(0755,root,root) %{udev_scriptdir}/ide-media.sh
+%attr(0755,root,root) %{udev_scriptdir}/dvb.sh
+%attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
%config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules
@@ -298,20 +302,16 @@
%attr(0644,root,root) %{_mandir}/man8/edd_id*.8*
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
-%ifarch s390 s390x
-%attr(0644,root,root) %{_mandir}/man8/dasd_id*.8*
-%endif
-
-%if %{with_persistent}
-%files -n udev-persistent
- %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
-%endif
-
%changelog
+* Fri Nov 11 2005 Harald Hoyer <harald@xxxxxxxxxx> - 075-2
+- moved /etc/udev/scripts to /lib/udev
+- moved /etc/udev/devices to /lib/udev/devices
+- added new event replay for kernel >= 2.6.15
+- added usb devices
+- renamed cpu device to cpuid (bug #161538)
+- changed vendor string "Onstream" to "On[sS]tream" (bug #173043)
+- compiled all *_id programs statically
+
* Fri Nov 11 2005 Harald Hoyer <harald@xxxxxxxxxx> - 075-1
- version 075
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|