X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fbase%2Fudev%2Fudev;h=09e0fcf9035ce8211254f85394160d8895503154;hb=50076d0b8f4acf70eb7e2fe5852b4b0de584c8bd;hp=31d077929bd841e263f474a7e3388f4d5c4c03b4;hpb=e6cbadee3fa9e3e04c70d6d652a64d7025936695;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/base/udev/udev b/packages/base/udev/udev
index 31d0779..09e0fcf 100644
--- a/packages/base/udev/udev
+++ b/packages/base/udev/udev
@@ -2,12 +2,16 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 059
+# [V] 080
 # [S] 1-9 2-15
-# [D] udev-059.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/
+# [D] udev-080.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/
 
-make_conf="udevdir=/dev $make_conf"
-install_conf="udevdir=/dev"
+#extras="extras/cdrom_id extras/scsi_id extras/volume_id extras/usb_id"
+#extras="$extras extras/ata_id extras/dasd_id extras/run_directory"
+extras=extras/run_directory
+
+make_conf="udevdir=/dev EXTRAS=$extras $make_conf"
+install_conf="udevdir=/dev EXTRAS=$extras"
 
 u_root=$root
 [ "$hdw_status" = "1" ] && u_root=/${s1_prefix}
@@ -22,19 +26,19 @@ post_install()	{
 	mkdir -p $root/var/lock/subsys
 	# documentation
 	rm -rf $docdir ; mkdir -p $docdir
-	cp -r docs FAQ HOWTO-udev_for_dev README* TODO $docdir
+	cp -r docs FAQ README* TODO ChangeLog RELEASE-NOTES $docdir
 	# config stuff
-	mkdir -p $u_root/etc/udev/{rules,permissions}.d
-	cp etc/udev/udev.rules* $u_root/etc/udev/rules.d/
-	cp etc/udev/udev.permissions* $u_root/etc/udev/permissions.d/
-	mv $u_root/etc/udev/rules.d/udev.rules{,.orig}
-	mv $u_root/etc/udev/permissions.d/udev.permissions{,.orig}
-	ln -svf udev.rules.devfs $u_root/etc/udev/rules.d/udev.rules
-	ln -svf udev.permissions.gentoo \
-		$u_root/etc/udev/permissions.d/udev.permissions
+	mkdir -p $u_root/etc/udev/rules.d
+	cp -v $confdir/udev.rules* $u_root/etc/udev/rules.d/
+	mkdir -p $u_root/etc/udev/scripts
+	cp -v ./extras/{path_id,*.sh} $u_root/etc/udev/scripts/
 	# init script
 	if [ "$hdw_status" = "2" ] ; then
 		cp $confdir/init_udev.sh $u_root/etc/init.d/udev
 		chmod 750 $u_root/etc/init.d/udev
 	fi
+	[ ! -f $u_root/etc/udev/udev.conf ] && \
+		cp -v $confdir/udev.conf $u_root/etc/udev/
+	ln -sf $root/lib/udev/udev_run_devd $root/sbin/
+	ln -sf $root/lib/udev/udev_run_hotplugd $root/sbin/
 		}