strange return bug ...

[hdw-linux/hdw-linux.git] / packages / base / udev / udev

diff --git a/packages/base/udev/udev b/packages/base/udev/udev
index 31d0779..a939989 100644 (file)
--- a/packages/base/udev/udev
+++ b/packages/base/udev/udev
@@ -2,39 +2,40 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 059
-# [S] 1-9 2-15
-# [D] udev-059.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/
+# [V] 102
+# [S] 1-3 2-15
+# [D] udev-102.tar.bz2 http://www.kernel.org/pub/linux/utils/kernel/hotplug/
 
-make_conf="udevdir=/dev $make_conf"
-install_conf="udevdir=/dev"
+extras=""
+for i in ata_id cdrom_id dasd_id edd_id firmware floppy path_id \
+               rule_generator run_directory scsi_id usb_id volume_id; do
+       extras="extras/$i $extras"
+done
+
+make_conf="udevdir=/dev EXTRAS=$extras $make_conf"
+install_conf="udevdir=/dev EXTRAS=$extras"
 
 u_root=$root
-[ "$hdw_status" = "1" ] && u_root=/${s1_prefix}
+[ "$stage" = "1" ] && u_root=/${tc_name}
 
-if [ "$hdw_status" = "1" ] ; then
+if [ "$stage" = "1" ] ; then
        make_conf="prefix=$prefix etcdir=$prefix/etc $make_conf"
        install_conf="DESTDIR=$prefix $install_conf"
 fi
 
 post_install() {
-       # subsys folder for locking
-       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 -rv 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/
        # init script
-       if [ "$hdw_status" = "2" ] ; then
+       if [ "$stage" = "2" ] ; then
                cp $confdir/init_udev.sh $u_root/etc/init.d/udev
                chmod 750 $u_root/etc/init.d/udev
+       fi
+       if [ ! -f $u_root/etc/udev/udev.conf ] ; then
+               cp -v $confdir/udev.conf $u_root/etc/udev/
        fi
                }