Permalink
Browse files

udev: Also squash crap from udev 164 init script

  • Loading branch information...
1 parent 501c53c commit 55fc3ff0a7efbfd3e16a4b305f900ed165a1a1a9 @cgwalters committed Feb 18, 2012
Showing with 15 additions and 38 deletions.
  1. +15 −38 meta/recipes-core/udev/udev-164/init
View
@@ -2,7 +2,7 @@
### BEGIN INIT INFO
# Provides: udev
-# Required-Start: mountvirtfs
+# Required-Start:
# Required-Stop:
# Default-Start: S
# Default-Stop:
@@ -11,49 +11,26 @@
export TZ=/etc/localtime
-[ -d /sys/class ] || exit 1
-[ -r /proc/mounts ] || exit 1
-[ -x /sbin/udevd ] || exit 1
-[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-
kill_udevd() {
- if [ -x /sbin/pidof ]; then
- pid=`/sbin/pidof -x udevd`
- [ -n "$pid" ] && kill $pid
- fi
+ if [ -x /sbin/pidof ]; then
+ pid=`/sbin/pidof -x udevd`
+ [ -n "$pid" ] && kill $pid
+ fi
}
export ACTION=add
# propagate /dev from /sys
-echo -n "Starting udev"
+echo "Starting udev"
-# mount the tmpfs on /dev, if not already done
-LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && {
- mount -n -o mode=0755 -t tmpfs none "/dev"
- mkdir -m 0755 /dev/pts
- mkdir -m 1777 /dev/shm
-}
+# make_extra_nodes
+kill_udevd > /dev/null 2>&1
-if [ -e /etc/dev.tar ]; then
- (cd /; tar xf /etc/dev.tar 2>&1 | grep -v 'time stamp' || true)
- not_first_boot=1
-fi
+# trigger the sorted events
+echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+/sbin/udevd -d
+
+/sbin/udevadm control --env STARTUP=1
+/sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform --action=add
+(/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
-# make_extra_nodes
-kill_udevd > "/dev/null" 2>&1
-
- # trigger the sorted events
- echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
- /sbin/udevd -d
-
- /sbin/udevadm control --env=STARTUP=1
- if [ "$not_first_boot" != "" ];then
- /sbin/udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform
- (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)&
- else
- /sbin/udevadm trigger --action=add
- /sbin/udevadm settle
- fi
-
-echo
exit 0

0 comments on commit 55fc3ff

Please sign in to comment.