From bdceeec2ea67f3d83acc85d28baeb3d6c4cb62e8 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 11 Jan 2006 12:11:24 +0000 Subject: [PATCH] - 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 --- start_udev | 82 ------------------------------------------------------ udev.nodes | 4 --- udev.spec | 36 ++++++++++++++++-------- 3 files changed, 25 insertions(+), 97 deletions(-) diff --git a/start_udev b/start_udev index 968e81b..5c4979e 100755 --- a/start_udev +++ b/start_udev @@ -100,40 +100,6 @@ make_extra_nodes () { 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 @@ kill_udevd() { } -# 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 diff --git a/udev.nodes b/udev.nodes index 7f01785..c374fad 100644 --- a/udev.nodes +++ b/udev.nodes @@ -13,10 +13,6 @@ loop4 loop5 loop6 loop7 -lp0 -lp1 -lp2 -lp3 parport0 parport1 parport2 diff --git a/udev.spec b/udev.spec index 1534cef..661c05a 100644 --- a/udev.spec +++ b/udev.spec @@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 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 @@ mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices} 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 @@ install -m 0644 extras/run_directory/MAKEDEV.dev $RPM_BUILD_ROOT/%{udev_scriptdi 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 </dev/null 2>&1 +done +EOF + + %preun if [ $1 = 0 -a -f %{_initrddir}/udev ]; then /sbin/chkconfig --del udev @@ -252,7 +256,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT #%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 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Tue Jan 11 2006 Harald Hoyer - 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 - 078-3 - fixed floppy module loading - added monitor socket