rpms/udev/devel start_udev, 1.48, 1.49 udev-078-redhat.patch, 1.2, 1.3 udev.nodes, 1.1, 1.2 udev.spec, 1.136, 1.137
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 11 12:11:27 UTC 2006
Author: harald
Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28557
Modified Files:
start_udev udev-078-redhat.patch udev.nodes udev.spec
Log Message:
- removed group "video" from the rules
- fixed specfile
- load nvram, floppy, parport and lp modules in
/etc/sysconfig/modules/udev-stw.modules until there
is a better solution
- fixed more floppy module loading
Index: start_udev
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/start_udev,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- start_udev 21 Dec 2005 11:36:19 -0000 1.48
+++ start_udev 11 Jan 2006 12:11:24 -0000 1.49
@@ -100,40 +100,6 @@
done
}
-# we cannot use /usr/bin/find here
-find_d () {
- where=$1
- what=$2
- found=""
- for f in $where/*; do
- if [ -d "$f" -a ! -L "$f" ]; then
- if [ "$f" != "${f%%$what}" ];then
- # make sure we are at the path end
- # we have no dirname and basename
- rest="${f#*$what}"
- [ "${rest##*/}" = "$rest" ] && found="$found $f"
- fi
- found="$found $(find_d $f $what)"
- fi
- done
- echo "$found"
-}
-
-# we cannot use /usr/bin/find here
-find_f () {
- where=$1
- what=$2
- found=""
- for f in $where/*; do
- if [ -d "$f" -a ! -L "$f" ]; then
- found="$found $(find_f $f $what)"
- elif [ -e "$f" ]; then
- [ "$where/" = "${f%$what}" ] && found="$found $f"
- fi
- done
- [ -n "$found" ] && echo "$found"
-}
-
kill_udevd() {
if [ -x /sbin/pidof ]; then
pid=`/sbin/pidof -x udevd`
@@ -142,54 +108,6 @@
}
-# call hotplug with the scsi devices
-scsi_replay () {
- HOTPLUG="/sbin/udevsend"
-
- scsi_hosts=$(find_d /sys/devices host\*)
-
- for host in $scsi_hosts;do
- [ -d $host ] || continue
- devs=$(find_f $host type)
- for dev in $devs;do
- [ -f $dev ] || continue
- DEVPATH=${dev%/type}
- DEVPATH=${DEVPATH#/sys}
- /bin/env -i DEVPATH="$DEVPATH" SUBSYSTEM=scsi_device ACTION=add $HOTPLUG scsi_device
- /bin/env -i DEVPATH="$DEVPATH" ACTION=add SUBSYSTEM=scsi $HOTPLUG scsi
- done
- done
- return 0
-}
-
-ide_scan() {
- if [ ! -d /proc/ide ]; then
- return 1
- fi
- for i in /proc/ide/*/media; do
- read media < "$i"
- case "$media" in
- disk)
- module=ide-disk
- ;;
- cdrom)
- module=ide-cd
- ;;
- tape)
- module=ide-tape
- ;;
- floppy)
- module=ide-floppy
- ;;
- *)
- module=ide-generic
- ;;
- esac
- /sbin/modprobe $module
- done
- return 0
-}
-
wait_for_queue() {
loop=20
while test ! -d /dev/.udev/queue; do
udev-078-redhat.patch:
etc/udev/redhat/udev.rules | 99 +++++++++++----------
extras/check-cdrom.sh | 39 ++++++++
extras/floppy/create_floppy_devices.c | 6 +
extras/ide-media.sh | 7 +
extras/load_floppy_module.sh | 35 +++++++
extras/run_directory/MAKEDEV.dev | 38 ++++++++
extras/run_directory/dev.d/default/pam_console.dev | 18 ---
extras/udevpermconv.sh | 94 +++++++++++++++++++
8 files changed, 277 insertions(+), 59 deletions(-)
Index: udev-078-redhat.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- udev-078-redhat.patch 23 Dec 2005 12:41:33 -0000 1.2
+++ udev-078-redhat.patch 11 Jan 2006 12:11:24 -0000 1.3
@@ -1,5 +1,5 @@
--- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/etc/udev/redhat/udev.rules 2005-12-23 13:35:57.000000000 +0100
++++ udev-078/etc/udev/redhat/udev.rules 2006-01-11 12:53:26.000000000 +0100
@@ -3,6 +3,11 @@
#
# default is OWNER="root" GROUP="root", MODE="0600"
@@ -103,6 +103,15 @@
# audio devices
KERNEL=="dsp*", MODE="0660"
+@@ -209,7 +224,7 @@
+ KERNEL=="fd[0-9]*", SYMLINK+="floppy%e"
+ KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660"
+ KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660"
+-KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660"
++KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="[36]", SYMLINK+="scanner%e", MODE="0660"
+
+ KERNEL=="umad*", NAME="infiniband/%k"
+ KERNEL=="issm*", NAME="infiniband/%k"
@@ -224,24 +239,25 @@
BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660"
@@ -133,19 +142,40 @@
-KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c"
+# dvb
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
#######################################
# Persistent block device stuff - begin
-@@ -331,3 +347,6 @@
+@@ -301,19 +317,11 @@
+
+
+ # Perhaps this should just be for all subsystems?
++ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias"
+
+-ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \
+- RUN+="/sbin/modprobe $modalias"
+-ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
+- RUN+="/sbin/modprobe $modalias"
+-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+- RUN+="/sbin/modprobe $modalias"
+ ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+ RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
+
+-ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
+- RUN+="/sbin/modprobe $modalias"
+-
+ ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
+ RUN+="/sbin/modprobe sd_mod"
+ ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
+@@ -331,3 +339,6 @@
ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \
RUN+="/sbin/firmware_helper"
+
+RUN+="socket:/org/kernel/udev/monitor"
+
---- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/ide-media.sh 2005-12-23 08:34:06.000000000 +0100
+--- /dev/null 2006-01-06 12:23:50.344776400 +0100
++++ udev-078/extras/ide-media.sh 2006-01-11 12:53:26.000000000 +0100
@@ -0,0 +1,7 @@
+#!/bin/bash
+i=0
@@ -154,8 +184,8 @@
+ i=$[i+1];
+done
+/bin/cat /proc/ide/$1/media
---- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/run_directory/MAKEDEV.dev 2005-12-23 08:34:06.000000000 +0100
+--- /dev/null 2006-01-06 12:23:50.344776400 +0100
++++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-11 12:53:26.000000000 +0100
@@ -0,0 +1,38 @@
+#!/bin/sh
+
@@ -196,7 +226,7 @@
+ /sbin/pam_console_apply $DEVNAME*
+fi
--- udev-078/extras/run_directory/dev.d/default/pam_console.dev.redhat 2005-12-17 16:40:29.000000000 +0100
-+++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2005-12-23 08:34:06.000000000 +0100
++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-11 12:53:26.000000000 +0100
@@ -1,16 +1,11 @@
#!/bin/sh
@@ -238,8 +268,8 @@
+ debug_mesg "Restoring console permissions for $DEVNAME $DEVLINKS"
+ /sbin/pam_console_apply "$DEVNAME" $DEVLINKS
fi
---- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/check-cdrom.sh 2005-12-23 08:34:06.000000000 +0100
+--- /dev/null 2006-01-06 12:23:50.344776400 +0100
++++ udev-078/extras/check-cdrom.sh 2006-01-11 12:53:26.000000000 +0100
@@ -0,0 +1,39 @@
+#!/bin/bash
+
@@ -280,8 +310,8 @@
+ done
+ exit 1
+}
---- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/udevpermconv.sh 2005-12-23 08:34:06.000000000 +0100
+--- /dev/null 2006-01-06 12:23:50.344776400 +0100
++++ udev-078/extras/udevpermconv.sh 2006-01-11 12:53:26.000000000 +0100
@@ -0,0 +1,94 @@
+#!/bin/bash
+#
@@ -377,8 +407,8 @@
+
+processInput
+exit 0
---- /dev/null 2005-12-16 16:12:26.451912136 +0100
-+++ udev-078/extras/load_floppy_modules.sh 2005-12-23 08:34:06.000000000 +0100
+--- /dev/null 2006-01-06 12:23:50.344776400 +0100
++++ udev-078/extras/load_floppy_module.sh 2006-01-11 12:53:26.000000000 +0100
@@ -0,0 +1,35 @@
+#!/bin/sh
+########################################################################
@@ -409,9 +439,25 @@
+floppy_devices=$(cat $PROC | sed -n '/Floppy.*\..*/p')
+
+if [ -n "$floppy_devices" ]; then
-+ /sbin/modprobe block-major-2
++ /sbin/modprobe block-major-2-
+else
+ /bin/true
+fi
+
+exit $?
+--- udev-078/extras/floppy/create_floppy_devices.c.redhat 2006-01-11 12:53:29.000000000 +0100
++++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-11 12:53:11.000000000 +0100
+@@ -116,8 +116,12 @@
+ minor = (table_sup[type][i] << 2) + fdnum;
+ if (print_nodes)
+ printf("%s b %d %d %d\n", node, mode, major, minor);
+- if (create_nodes)
++ if (create_nodes) {
++ char buffer[2048]; buffer[2047]='\000';
+ mknod(node, S_IFBLK | mode, makedev(major,minor));
++ snprintf(buffer, 2047, "/sbin/restorecon \"%s\" ;/sbin/pam_console_apply \"%s\" ; ", node, node);
++ system(buffer);
++ }
+ i++;
+ }
+
Index: udev.nodes
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.nodes,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev.nodes 18 Feb 2005 13:07:41 -0000 1.1
+++ udev.nodes 11 Jan 2006 12:11:24 -0000 1.2
@@ -13,10 +13,6 @@
loop5
loop6
loop7
-lp0
-lp1
-lp2
-lp3
parport0
parport1
parport2
Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- udev.spec 23 Dec 2005 12:48:26 -0000 1.136
+++ udev.spec 11 Jan 2006 12:11:24 -0000 1.137
@@ -5,7 +5,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 078
-Release: 3
+Release: 4
License: GPL
Group: System Environment/Base
Provides: udev-persistent = 0:%{version}-%{release}
@@ -28,22 +28,16 @@
Prereq: /bin/sh fileutils hotplug
Prereq: MAKEDEV >= 0:3.11
BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel
-Requires: libselinux >= 0:1.17.9-2 MAKEDEV
+BuildRequires: pam-devel glib2-devel bison
+Requires: libselinux >= 0:1.17.9-2 MAKEDEV sed pam
Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84
Obsoletes: dev
Provides: dev = 0:3.12-1
-BuildRequires: pam-devel glib2-devel bison
-Requires: pam
-
%description
The udev package contains an implementation of devfs in
userspace using sysfs and netlink.
-Requires: sed
-
-%define add %{nil}
-
%prep
%setup -q
%patch1 -p1 -b .redhat
@@ -159,7 +153,7 @@
install -m 0644 extras/run_directory/dev.d/default/pam_console.dev $RPM_BUILD_ROOT%{udev_scriptdir}
ln -s %{udev_scriptdir}/pam_console.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default/05-pam_console.dev
-for i in load_floppy_modules.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do
+for i in load_floppy_module.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do
install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir}
done
@@ -174,6 +168,16 @@
mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware
+# short-term workaround
+mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules
+cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules <<EOF
+#!/bin/sh
+for i in nvram floppy parport_pc parport lp;do
+ modprobe \$i >/dev/null 2>&1
+done
+EOF
+
+
%preun
if [ $1 = 0 -a -f %{_initrddir}/udev ]; then
/sbin/chkconfig --del udev
@@ -252,7 +256,7 @@
%attr(0755,root,root) %{udev_scriptdir}/ide-media.sh
%attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
%attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices
-%attr(0755,root,root) %{udev_scriptdir}/load_floppy_modules.sh
+%attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
%config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
@@ -263,6 +267,8 @@
#%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config
+%config %attr(0755,root,root)/etc/sysconfig/modules/udev-stw.modules
+
%dir %attr(0755,root,root) /lib/firmware
%attr(0644,root,root) %{_mandir}/man8/udev*.8*
%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8*
@@ -271,6 +277,14 @@
%attr(0644,root,root) %{_mandir}/man8/vol_id*.8*
%changelog
+* Tue Jan 11 2006 Harald Hoyer <harald at redhat.com> - 078-4
+- removed group "video" from the rules
+- fixed specfile
+- load nvram, floppy, parport and lp modules in
+ /etc/sysconfig/modules/udev-stw.modules until there
+ is a better solution
+- fixed more floppy module loading
+
* Fri Dec 23 2005 Harald Hoyer <harald at redhat.com> - 078-3
- fixed floppy module loading
- added monitor socket
More information about the fedora-cvs-commits
mailing list