]> git.pld-linux.org Git - packages/systemd.git/blobdiff - start_udev
- rel 12
[packages/systemd.git] / start_udev
index f14dde70a5448fb16393fbc5c16a90b38903086a..a2d20c0e1c89c0513472a1825f415d5e676063fc 100644 (file)
@@ -8,12 +8,12 @@
 #
 # Released under the GPL v2 only.
 #
-# This needs to be run at the earliest possible point in the boot 
+# This needs to be run at the earliest possible point in the boot
 # process.
 #
 # Based on the udev init.d script
 #
-# Thanks go out to the Gentoo developers for proving 
+# Thanks go out to the Gentoo developers for proving
 # that this is possible to do.
 #
 # Yes, it's very verbose, feel free to turn off all of the echo calls,
@@ -21,7 +21,7 @@
 # properly during development...
 
 # default value, if no config present.
-udev_root="/dev/"
+udev_root="/dev"
 sysfs_dir="/sys"
 udevd_timeout=8
 
@@ -34,31 +34,46 @@ udevd_timeout=8
 
 prog=udev
 bin=/sbin/udev
-udevd=/sbin/udevd
+udevd=/lib/udev/udevd
+# trim traling slash, code expects it not to be there
+udev_root=${udev_root%/}
 
 make_extra_nodes () {
        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
+               [ "$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
-       cp -a /lib/udev/devices/* /dev/ >/dev/null 2>&1 || :
+       [ -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() {
        if [ -x /sbin/pidof ]; then
-               pid=`/sbin/pidof -x udevd`
+               pid=$(/sbin/pidof -x udevd)
                [ -n "$pid" ] && kill $pid
        fi
 }
 
 set_hotplug_handler() {
-    echo "" > /proc/sys/kernel/hotplug
+       echo "" > /proc/sys/kernel/hotplug
+}
+
+# find subdirs mounted under $udev_root
+get_dev_mounts() {
+       awk -vudev_root="$udev_root/" '
+       BEGIN {
+         len = length(udev_root);
+       }
+
+       substr($2, 1, len) == udev_root {
+         print substr($2, len + 1)
+       }' /proc/mounts
 }
 
 export ACTION=add
@@ -67,90 +82,61 @@ ret=0
 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)
-               mount --move $udev_root/pts "$PTSDIR"
-       fi
-       if LANG=C fgrep -q "none ${udev_root%/}/shm " /proc/mounts; then
-               SHMDIR=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
-               mount --move $udev_root/shm "$SHMDIR"
-       fi
-       mount -n -o mode=0755 -t tmpfs none "$udev_root"
-       mkdir -m 0755 $udev_root/pts
-       mkdir -m 0755 $udev_root/shm
-       if [ -n "$PTSDIR" ]; then
-               mount --move "$PTSDIR" $udev_root/pts
-               rmdir "$PTSDIR"
-       fi
-       if [ -n "$SHMDIR" ]; then
-               mount --move "$SHMDIR" $udev_root/shm
-               rmdir "$SHMDIR"
-       fi
+# mount the devtmpfs on $udev_root, if not already done
+awk "\$2 == \"$udev_root\" && \$3 == \"devtmpfs\" { exit 1 }" /proc/mounts && {
+       submounts=$(get_dev_mounts)
 
+       if [ "$submounts" ]; then
+               # mount to temporary location to be able to move submounts
+               # this needs writable TMPDIR:-/tmp, so it won't work in early boot
+               # but fix is simple: use initramfs instead of romfs
+               devdir=$(mktemp -d ${TMPDIR:-/tmp}/tmpXXXXXX)
+       else
+               devdir=$udev_root
+       fi
+       mount -n -o mode=0755 -t devtmpfs devtmpfs "$devdir"
        ret=$(( $ret + $? ))
+
+       # relocate submounts
+       for dir in $submounts; do
+               mount -n --move $udev_root/$dir $devdir/$dir
+               ret=$(( $ret + $? ))
+       done
+
+       if [ "$submounts" ]; then
+               mount -n --move $devdir $udev_root
+               rmdir $devdir
+       fi
 }
 
 kill_udevd > "$udev_root/null" 2>&1
 
-if [ -f "/sys/class/tty/console/uevent" ]; then
+# Start udevd daemon
+$udevd --daemon
+ret=$(( $ret + $? ))
 
-       # Start udevd daemon
-       udevd --daemon
-       ret=$(( $ret + $? ))
-       
+# Making extra nodes
+make_extra_nodes
+ret=$(( $ret + $? ))
+
+if [ -f "/sys/class/tty/console/uevent" ]; then
        # Setting default hotplug handler
        set_hotplug_handler
        ret=$(( $ret + $? ))
-       
-       # Making extra nodes
-       make_extra_nodes
-       ret=$(( $ret + $? ))
-       
+
        # retrigger all events
-       mkdir -p /dev/.udev/queue
-       list=$(echo /sys/bus/*/devices/*/uevent)
-       list="$list $(echo /sys/class/*/*/uevent)"
-       list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)"
-       for i in $list; do
-           case "$i" in
-               */device/uevent|*\**)
-                   continue
-                   ;;
-               */class/mem/*|*/class/tty/*)
-                   first="$first $i"
-                   ;;
-               */block/md*)
-                   last="$last $i"
-                   ;;
-               */*)
-                   default="$default $i"
-                   ;;
-           esac
-       done
-       
+       # Udev finds 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 + $? ))
-       
-       # trigger the sorted events
-       for i in $first $default $last; do
-           echo "add" > "$i"
-       done
 
-       ret=$(( $ret + $? ))
-       
        # wait for the events to finish
-       loop=300
-       while test -d /dev/.udev/queue; do
-           sleep 0.1;
-           test "$loop" -gt 0 || break
-           loop=$(($loop - 1))
-       done
-       
+       udevadm settle
        ret=$(( $ret + $? ))
 else
-       echo "udev requires a kernel >= 2.6.15, not started."
-       exit 0                                                
+       echo "Kernel too old for this udev version"
 fi
 
 ret=$(( $ret + $? ))
This page took 0.100882 seconds and 4 git commands to generate.