]> git.pld-linux.org Git - packages/systemd.git/blobdiff - start_udev
- fix packagekit files
[packages/systemd.git] / start_udev
index 7cab68f046bde0c4a99bdd22d8f9e1c13710ffc8..0ad5738e3a97f8eb92ac8af1787bff95f3a1ee5b 100644 (file)
 # default value, if no config present.
 udev_root="/dev/"
 sysfs_dir="/sys"
-udev_db="/dev/.udevdb"
+udevd_timeout=8
 
 # don't use udev if sysfs is not mounted.
 [ -d $sysfs_dir/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
-[ -x /sbin/udev ] || exit 1
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
 . /etc/rc.d/init.d/functions
@@ -36,31 +35,20 @@ udev_db="/dev/.udevdb"
 prog=udev
 bin=/sbin/udev
 udevd=/sbin/udevd
-MAKEDEV="/sbin/MAKEDEV"
 
 make_extra_nodes () {
-       ln -snf /proc/self/fd $udev_root/fd
-       ln -snf /proc/self/fd/0 $udev_root/stdin
-       ln -snf /proc/self/fd/1 $udev_root/stdout
-       ln -snf /proc/self/fd/2 $udev_root/stderr
-       ln -snf /proc/kcore $udev_root/core
-
-       [ -d $udev_root/pts ] || mkdir -m 0755 $udev_root/pts
-       [ -d $udev_root/shm ] || mkdir -m 0755 $udev_root/shm
-
-       if [ -x $MAKEDEV ]; then
-               $MAKEDEV -x $( 
-                       for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
-                           echo cpu/$i/microcode;
-                       done;
-                       for i in 1 2 3 4 5 6; do echo tty$i;done;
-                       for i in 0 1 2 3 4 5 6 7; do echo loop$i; done;
-                       for i in 0 1 2 3; do echo lp$i; echo parport$i;done;
-                       echo net/tun ppp console null zero;
-               );
-               [ -a /dev/MAKEDEV ] || ln -sf "$MAKEDEV" /dev/MAKEDEV;
-               cp -a /etc/udev/devices/* /dev/ >/dev/null 2>&1 || :
-       fi
+       grep '^[^#]' /etc/udev/links.conf | \
+       while read type name arg1; do
+           [ "$type" -a "$name" -a ! -e "$udev_root/$name" -a ! -L "/dev/$name" ] ||continue
+           case "$type" in
+               L) ln -s $arg1 $udev_root/$name ;;
+               D) mkdir -p $udev_root/$name ;;
+               M) mknod -m 600 /dev/$name $arg1 ;;
+               *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+           esac
+       done
+       [ -d /lib/udev/devices ] && cp -a /lib/udev/devices/* /dev/ >/dev/null 2>&1 || :
+       [ -d /lib64/udev/devices ] && cp -a /lib64/udev/devices/* /dev/ >/dev/null 2>&1 || :
 }
 
 kill_udevd() {
@@ -70,114 +58,20 @@ kill_udevd() {
        fi
 }
 
-# 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"
-}
-
-# call hotplug with the scsi devices
-scsi_replay () {
-       HOTPLUG="/sbin/udevsend"
-
-       scsi_hosts=$(find_d /sys/devices host\*)
-       SEQNUM=1
-
-       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
-}
-
-supported_kernel() {
-    case "$(uname -r)" in
-    2.[012345].*) return 1 ;;
-    esac
-    return 0
-}
-
 set_hotplug_handler() {
-    echo /sbin/udevsend > /proc/sys/kernel/hotplug
+    echo "" > /proc/sys/kernel/hotplug
 }
 
 export ACTION=add
 prog=udev
 ret=0
-nls "Starting udev"
-
-if ! supported_kernel; then
-    echo "udev requires a kernel >= 2.6.x, not started."
-    exit 0                                                
-fi
+show "Starting udev"
+busy
 
 # mount the tmpfs on ${udev_root%/}, if not already done
 LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
-       if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
-               PTSDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
+       if LANG=C fgrep -q "none ${udev_root%/}/pts " /proc/mounts; then
+               PTSDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
                mount --move $udev_root/pts "$PTSDIR"
        fi
        if LANG=C fgrep -q "none ${udev_root%/}/shm " /proc/mounts; then
@@ -199,25 +93,36 @@ LANG=C awk "\$2 == \"${udev_root%/}\" && \$3 == \"tmpfs\" { exit 1 }" /proc/moun
        ret=$(( $ret + $? ))
 }
 
-rm -fr "$udev_db"
-
-make_extra_nodes
-
 kill_udevd > "$udev_root/null" 2>&1
 
-scsi_replay > "$udev_root/null" 2>&1
-
-ret=$(( $ret + $? ))
-
-ide_scan > "$udev_root/null" 2>&1
-
-set_hotplug_handler
-
-/sbin/udevstart
+       # Start udevd daemon
+       udevd --daemon
+       ret=$(( $ret + $? ))
+       
+       # Making extra nodes
+       make_extra_nodes
+       ret=$(( $ret + $? ))
+       
+if [ -f "/sys/class/tty/console/uevent" ]; then
 
-/sbin/udevd --daemon
+       # Setting default hotplug handler
+       set_hotplug_handler
+       ret=$(( $ret + $? ))
 
-/sbin/udev_input_coldplug start
+       # retrigger all events
+       # Udev find's it's own way of making this dir
+       # and making it by hand makes udevsettle
+       # work forever
+       #mkdir -p /dev/.udev/queue
+       udevadm trigger 
+       ret=$(( $ret + $? ))
+       
+       # wait for the events to finish
+       udevadm settle  
+       ret=$(( $ret + $? ))
+else
+       echo "Kernel too old for this udev version"
+fi
 
 ret=$(( $ret + $? ))
 [ $ret -eq 0 ] && ok || fail
This page took 0.038617 seconds and 4 git commands to generate.