X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=start_udev;h=bf64dc55b3135c427e04ba82fc25514a97f844f9;hb=aab2a6f93795d53a867ca31b48b8247c8af6f706;hp=250a73fd8e26242fc635d7fdaad51eb19c48f632;hpb=ec7c09398e3c94d183f3a965f2e55f232d1a4441;p=packages%2Fsystemd.git

diff --git a/start_udev b/start_udev
old mode 100644
new mode 100755
index 250a73f..bf64dc5
--- a/start_udev
+++ b/start_udev
@@ -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,186 +21,155 @@
 # properly during development...
 
 # default value, if no config present.
-udev_root="/dev/"
+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
 
 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
+udevd=/lib/udev/udevd
+# trim traling slash, code expects it not to be there
+udev_root=${udev_root%/}
+
+create_static_nodes() {
+	/sbin/kmod static-nodes --format=tmpfiles | \
+	while read type file mode uid gid age dev ; do
+		case $type in
+			d|D)
+				mkdir -p --mode=$mode $file
+				;;
+			*)
+				oldIFS=$IFS
+				IFS=":"
+				set -- $dev
+				maj=$1
+				min=$2
+				IFS=$oldIFS
+				mknod --mode=$mode $file $type $maj $min
+				;;
+		esac
+		[ $uid = "-" ] || chown $uid $file
+		[ $gid = "-" ] || chgrp $gid $file
+	done
+}
+
+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
+	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() {
 	if [ -x /sbin/pidof ]; then
-		pid=`/sbin/pidof -x udevd`
+		pid=$(/sbin/pidof -x udevd)
 		[ -n "$pid" ] && kill $pid
 	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"
+set_hotplug_handler() {
+	echo "" > /proc/sys/kernel/hotplug
 }
 
-# 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"
-}
+# find subdirs mounted under $udev_root
+get_dev_mounts() {
+	awk -vudev_root="$udev_root/" '
+	BEGIN {
+	  len = length(udev_root);
+	}
 
-# 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
+	substr($2, 1, len) == udev_root {
+	  print substr($2, len + 1)
+	}' /proc/mounts
 }
 
-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
-}
+show "Starting udev"; busy
 
 export ACTION=add
 prog=udev
 ret=0
-nls "Starting udev"
 
-# 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"
+# 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 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 -n -o mode=0755 -t devtmpfs devtmpfs "$devdir"
 	ret=$(( $ret + $? ))
-}
 
-rm -fr "$udev_db"
+	# relocate submounts
+	for dir in $submounts; do
+		mount -n --move $udev_root/$dir $devdir/$dir
+		ret=$(( $ret + $? ))
+	done
 
-make_extra_nodes
+	if [ "$submounts" ]; then
+		mount -n --move $devdir $udev_root
+		rmdir $devdir
+	fi
+}
 
 kill_udevd > "$udev_root/null" 2>&1
 
-scsi_replay > "$udev_root/null" 2>&1
+# Create required static device nodes for the current kernel
+create_static_nodes
 
-ret=$(( $ret + $? ))
+# Start udevd daemon
+$udevd --daemon; rc=$?
+test $rc -eq 0 && ok || fail
+ret=$(( $ret + $rc ))
 
-ide_scan > "$udev_root/null" 2>&1
+# Making extra nodes
+show "Setup extra nodes"; busy
+make_extra_nodes; rc=$?
+test $rc -eq 0 && ok || fail
+ret=$(( $ret + $rc ))
 
-echo /sbin/udevsend > /proc/sys/kernel/hotplug
-
-/sbin/udevstart
-
-/sbin/udevd --daemon
+if [ -f /sys/class/tty/console/uevent ]; then
+	# Setting default hotplug handler
+	set_hotplug_handler
+	ret=$(( $ret + $? ))
 
-ret=$(( $ret + $? ))
-[ $ret -eq 0 ] && ok || fail
-exit 0
+	# retrigger all events
+	show "Retrigger subsystems events"; busy
+	/sbin/udevadm trigger --type=subsystems --action=add; rc=$?
+	test $rc -eq 0 && ok || fail
+	ret=$(( $ret + $rc ))
+
+	show "Retrigger devices events"; busy
+	/sbin/udevadm trigger --type=devices --action=add; rc=$?
+	test $rc -eq 0 && ok || fail
+	ret=$(( $ret + $rc ))
+
+	# wait for the events to finish
+	show "udevadm settle"; busy
+	/sbin/udevadm settle; rc=$?
+	test $rc -eq 0 && ok || fail
+	ret=$(( $ret + $rc ))
+else
+	echo "Kernel too old for this udev version"
+fi
+
+exit $ret