summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-05-23 13:06:28 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-05-23 16:13:18 +0200
commit4ab0bd193541063df88176981997a4a2b277416f (patch)
treece6fe80038a7bba53f4a97ad7e6ed3db7435da71 /meta-oe/recipes-core
parentc62295ec6adc3da3283890071d452fd5abc1a08f (diff)
downloadmeta-openembedded-4ab0bd193541063df88176981997a4a2b277416f.tar.gz
udev: fix init script indenting
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/udev/udev/init44
1 files changed, 22 insertions, 22 deletions
diff --git a/meta-oe/recipes-core/udev/udev/init b/meta-oe/recipes-core/udev/udev/init
index c0ecdfc50..808d9e901 100644
--- a/meta-oe/recipes-core/udev/udev/init
+++ b/meta-oe/recipes-core/udev/udev/init
@@ -18,10 +18,10 @@ export TZ=/etc/localtime
18[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf 18[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
19 19
20kill_udevd() { 20kill_udevd() {
21 if [ -x /sbin/pidof ]; then 21 if [ -x /sbin/pidof ]; then
22 pid=`/sbin/pidof -x udevd` 22 pid=`/sbin/pidof -x udevd`
23 [ -n "$pid" ] && kill $pid 23 [ -n "$pid" ] && kill $pid
24 fi 24 fi
25} 25}
26 26
27export ACTION=add 27export ACTION=add
@@ -30,9 +30,9 @@ echo "Starting udev"
30 30
31# mount the tmpfs on /dev, if not already done 31# mount the tmpfs on /dev, if not already done
32LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { 32LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && {
33 mount -n -o mode=0755 -t tmpfs none "/dev" 33 mount -n -o mode=0755 -t tmpfs none "/dev"
34 mkdir -m 0755 /dev/pts 34 mkdir -m 0755 /dev/pts
35 mkdir -m 1777 /dev/shm 35 mkdir -m 1777 /dev/shm
36} 36}
37 37
38if [ "$DEVCACHE" != "" ]; then 38if [ "$DEVCACHE" != "" ]; then
@@ -42,10 +42,10 @@ if [ "$DEVCACHE" != "" ]; then
42 [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices 42 [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices
43 [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags 43 [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags
44 if [ -e $DEVCACHE ] && \ 44 if [ -e $DEVCACHE ] && \
45 cmp -s /tmp/uname /etc/udev/saved.uname && \ 45 cmp -s /tmp/uname /etc/udev/saved.uname && \
46 cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ 46 cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \
47 cmp -s /tmp/devices /etc/udev/saved.devices && \ 47 cmp -s /tmp/devices /etc/udev/saved.devices && \
48 cmp -s /tmp/atags /etc/udev/saved.atags; then 48 cmp -s /tmp/atags /etc/udev/saved.atags; then
49 (cd /; tar xf $DEVCACHE > /dev/null 2>&1) 49 (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
50 not_first_boot=1 50 not_first_boot=1
51 fi 51 fi
@@ -59,17 +59,17 @@ fi
59# make_extra_nodes 59# make_extra_nodes
60kill_udevd > "/dev/null" 2>&1 60kill_udevd > "/dev/null" 2>&1
61 61
62 # trigger the sorted events 62# trigger the sorted events
63 echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug 63echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
64 /sbin/udevd -d 64/sbin/udevd -d
65 65
66 /sbin/udevadm control --env STARTUP=1 66/sbin/udevadm control --env STARTUP=1
67 if [ "$not_first_boot" != "" ];then 67if [ "$not_first_boot" != "" ];then
68 /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 68 /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
69 (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)& 69 (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)&
70 else 70else
71 /sbin/udevadm trigger 71 /sbin/udevadm trigger
72 /sbin/udevadm settle 72 /sbin/udevadm settle
73 fi 73fi
74 74
75exit 0 75exit 0