[PATCH] remove the database at startup.

[elogind.git] / etc / init.d / udev

diff --git a/etc/init.d/udev b/etc/init.d/udev
index 5c09afd205c6cde35e798d8a961d8294b849f4e6..437556c3fb964a8448cb2380124e36ade1c76018 100644 (file)
--- a/etc/init.d/udev
+++ b/etc/init.d/udev
@@ -7,34 +7,23 @@
 
 . /etc/rc.d/init.d/functions
 
-udev_dir=/udev
+. /etc/udev/udev.conf
+
 sysfs_dir=/sys
 bin=/sbin/udev
 
-case "$1" in
-  start)
-       if [ ! -d $udev_dir ]; then
-               mkdir $udev_dir
-       fi
-       if [ ! -d $sysfs_dir ]; then
-               exit 1
-       fi
-       # propogate /udev from /sys - we only need this while we do not
-       # have initramfs and an early user-space with which to do early
-       # device bring up
-       action "Creating initial udev device nodes: " /bin/true
-       export ACTION=add
-       # add block devices and their partitions
+run_udev () {
+       # handle block devices and their partitions
        for i in ${sysfs_dir}/block/*; do
                # add each drive
                export DEVPATH=${i#${sysfs_dir}}
-               $bin block
+               $bin block &
 
                # add each partition, on each device
                for j in $i/*; do
                        if [ -f $j/dev ]; then
                                export DEVPATH=${j#${sysfs_dir}}
-                               $bin block
+                               $bin block &
                        fi
                done
        done
@@ -45,30 +34,56 @@ case "$1" in
                                export DEVPATH=${j#${sysfs_dir}}
                                CLASS=`echo ${i#${sysfs_dir}} | \
                                        cut --delimiter='/' --fields=3-`
-                               $bin $CLASS
+                               $bin $CLASS &
                        fi
                done
        done
+}
+
+
+case "$1" in
+  start)
+       if [ ! -d $sysfs_dir ]; then
+               exit 1
+       fi
+       if [ ! -d $udev_root ]; then
+               mkdir $udev_root
+       fi
+
+       # remove the database if it is there as we always want to start fresh
+       if [ -f $udev_root/.udevdb ]; then
+               rm -f $udev_root/.udevdb
+       fi
+
+       # propogate /udev from /sys - we only need this while we do not
+       # have initramfs and an early user-space with which to do early
+       # device bring up
+       action "Creating initial udev device nodes: " /bin/true
+       export ACTION=add
+       run_udev 
        ;;
   stop)
        # be careful
-       if [ $udev_dir -a "$udev_dir" != "/" ]; then
-               # clear out /udev
-               rm -rf ${udev_dir}/*
-       fi
+       action "Removing udev device nodes: " /bin/true
+       export ACTION=remove
+       run_udev 
        ;;
   status)
-       if [ -d $udev_dir ]; then
+       if [ -d $udev_root ]; then
                echo "the udev device node directory exists"
        else
                echo "the udev device node directory does not exist"
        fi
        ;;
-  restart|reload)
+  restart)
+       $0 stop
+       $0 start
+       ;;
+  reload)
        # nothing to do here
        ;;
   *)
-       echo "Usage: $0 {start|stop|status}"
+       echo "Usage: $0 {start|stop|status|restart}"
        exit 1
 esac