diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2011-05-23 13:06:28 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-05-23 16:13:18 +0200 |
| commit | 4ab0bd193541063df88176981997a4a2b277416f (patch) | |
| tree | ce6fe80038a7bba53f4a97ad7e6ed3db7435da71 /meta-oe/recipes-core/udev | |
| parent | c62295ec6adc3da3283890071d452fd5abc1a08f (diff) | |
| download | meta-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/udev')
| -rw-r--r-- | meta-oe/recipes-core/udev/udev/init | 44 |
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 c0ecdfc50b..808d9e9012 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 [ -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 @@ -30,9 +30,9 @@ echo "Starting udev" # mount the tmpfs on /dev, if not already done LANG=C awk "\$2 == \"/dev\" && \$3 == \"tmpfs\" { exit 1 }" /proc/mounts && { - mount -n -o mode=0755 -t tmpfs none "/dev" - mkdir -m 0755 /dev/pts - mkdir -m 1777 /dev/shm + mount -n -o mode=0755 -t tmpfs none "/dev" + mkdir -m 0755 /dev/pts + mkdir -m 1777 /dev/shm } if [ "$DEVCACHE" != "" ]; then @@ -42,10 +42,10 @@ if [ "$DEVCACHE" != "" ]; then [ -r /proc/devices ] && cat /proc/devices > /tmp/devices || touch /tmp/devices [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags if [ -e $DEVCACHE ] && \ - cmp -s /tmp/uname /etc/udev/saved.uname && \ - cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ - cmp -s /tmp/devices /etc/udev/saved.devices && \ - cmp -s /tmp/atags /etc/udev/saved.atags; then + cmp -s /tmp/uname /etc/udev/saved.uname && \ + cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ + cmp -s /tmp/devices /etc/udev/saved.devices && \ + cmp -s /tmp/atags /etc/udev/saved.atags; then (cd /; tar xf $DEVCACHE > /dev/null 2>&1) not_first_boot=1 fi @@ -59,17 +59,17 @@ fi # 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 +# 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 --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=8; /sbin/udevadm control --env STARTUP=)& - else - /sbin/udevadm trigger - /sbin/udevadm settle - fi +/sbin/udevadm control --env STARTUP=1 +if [ "$not_first_boot" != "" ];then + /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 + (/sbin/udevadm settle --timeout=8; /sbin/udevadm control --env STARTUP=)& +else + /sbin/udevadm trigger + /sbin/udevadm settle +fi exit 0 |