[Lunar-commits] r15631 - moonbase/branches/submissions/new

[zbiggy]

Author: zbiggy
Date: 2005-07-07 12:26:21 +0000 (Thu, 07 Jul 2005)
New Revision: 15631

Added:
   moonbase/branches/submissions/new/udev-061.patch2
Log:
This patch2 meets nestu's requirements. It also does some clean up after first patch which appeared for a moment in moonbase.
Both: patch1 and patch2 are working patches. Only one of them can be used at once. So choose which one would you like to use.
This clean up I'm talking about is for people who installed udev with patch1 and now want to use patch2. Otherwise cleanup
does nothing.


Added: moonbase/branches/submissions/new/udev-061.patch2
===================================================================
--- moonbase/branches/submissions/new/udev-061.patch2	2005-07-07 12:20:31 UTC (rev 15630)
+++ moonbase/branches/submissions/new/udev-061.patch2	2005-07-07 12:26:21 UTC (rev 15631)
@@ -0,0 +1,39 @@
+--- udev/49-udev.rules	2005-06-23 19:32:57.000000000 +0200
++++ udev/49-udev.rules	2005-07-07 13:44:42.000000000 +0200
+@@ -286,3 +286,5 @@
+ 
+ # dvb devices
+ KERNEL="dvb*",  PROGRAM="/etc/udev/scripts/dvb.sh %k",  NAME="%c",  GROUP="video"
++RUN="/sbin/udev_run_devd"
++ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
+--- udev/BUILD	2005-07-07 09:31:51.000000000 +0200
++++ udev/BUILD	2005-07-07 13:53:09.000000000 +0200
+@@ -2,10 +2,10 @@
+ 
+     patch_it $SOURCE2 0        &&
+ 
+-    make udevdir=/dev          &&
++    make udevdir=/dev EXTRAS=extras/run_directory &&
+     prepare_install            &&
+-    make udevdir=/dev install  &&
+- 
++    make udevdir=/dev EXTRAS=extras/run_directory install  &&
++
+     # install the init.d script
+     # we cannot use automagic install via coretools
+     # since the udev script would be linked from rcX.d
+@@ -18,7 +18,11 @@
+     for script in ide-devfs.sh scsi-devfs.sh dvb.sh raid-devfs.sh
+     do
+         install extras/${script} /etc/udev/scripts.d/
+-    done
+-     
++    done &&
++# compability patch included by Zbigniew 'zbiggy' Luszpinski  <zbiggy at o2.pl>
++cp /etc/udev/rules.d/50-udev.rules /etc/udev/rules.d/50-udev.rulez &&
++sed "/RUN=\"\/sbin\/udev_run_devd\"/d" /etc/udev/rules.d/50-udev.rulez > /etc/udev/rules.d/50-udev.rules &&
++sed "/RUN=\"\/sbin\/udev_run_hotplugd\"/d" /etc/udev/rules.d/50-udev.rules > /etc/udev/rules.d/50-udev.rulez &&
++cp /etc/udev/rules.d/50-udev.rulez /etc/udev/rules.d/50-udev.rules &&
++rm /etc/udev/rules.d/50-udev.rulez
+ ) > $C_FIFO 2>&1
+-