Author: freetz Date: Thu Jan 26 18:49:07 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- small fixes
---- Files affected:
SOURCES:
start_udev (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SOURCES/start_udev
diff -u SOURCES/start_udev:1.32 SOURCES/start_udev:1.33
--- SOURCES/start_udev:1.32 Thu Jan 26 17:58:34 2006
+++ SOURCES/start_udev Thu Jan 26 19:49:02 2006
@@ -28,7 +28,6 @@
# 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
@@ -44,6 +43,7 @@
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
@@ -60,16 +60,13 @@
set_hotplug_handler() {
echo "" > /proc/sys/kernel/hotplug
}
-
return
0
+
export ACTION=add
prog=udev
ret=0
show "Starting udev"
busy
-if ! supported_kernel; then
- fail
-fi
# 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
@@ -98,14 +95,18 @@
kill_udevd > "$udev_root/null" 2>&1
if [ -f "/sys/class/tty/console/uevent" ]; then
+
# Start udevd daemon
udevd --daemon
+ ret=$(( $ret + $? ))
- # Making extra nodes
- make_extra_nodes
-
- # Setting default hotplug handler
+ # 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
@@ -128,13 +129,16 @@
;;
esac
done
-
+
+ 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
@@ -142,6 +146,8 @@
test "$loop" -gt 0 || break
loop=$(($loop - 1))
done
+
+ ret=$(( $ret + $? ))
else
echo "udev requires a kernel >= 2.6.15, not started."
exit 0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/start_udev?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
