diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-20 13:27:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-03 12:14:28 +0000 |
| commit | d97d07c5ef0430753759449f2e2bd2ba1c0ff0f1 (patch) | |
| tree | 7eea9cb7d0ac76ab1ea9f5ce4e8134ee68ea89ee | |
| parent | e412dbf6cd67702bb50126a0f5ab9aecbe9c90bf (diff) | |
| download | poky-d97d07c5ef0430753759449f2e2bd2ba1c0ff0f1.tar.gz | |
udev: use tabs for init script (no code changes)
(From OE-Core rev: d6b7ff13a64c6ff2aa8d1ee089733c9aada539a9)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/udev/udev/init | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init index 073942f27e..edc3c9a146 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init | |||
| @@ -17,10 +17,10 @@ export TZ=/etc/localtime | |||
| 17 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf | 17 | [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf |
| 18 | 18 | ||
| 19 | kill_udevd() { | 19 | kill_udevd() { |
| 20 | if [ -x /sbin/pidof ]; then | 20 | if [ -x /sbin/pidof ]; then |
| 21 | pid=`/sbin/pidof -x udevd` | 21 | pid=`/sbin/pidof -x udevd` |
| 22 | [ -n "$pid" ] && kill $pid | 22 | [ -n "$pid" ] && kill $pid |
| 23 | fi | 23 | fi |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | export ACTION=add | 26 | export ACTION=add |
| @@ -29,9 +29,9 @@ echo -n "Starting udev" | |||
| 29 | 29 | ||
| 30 | # mount the tmpfs on /dev, if not already done | 30 | # mount the tmpfs on /dev, if not already done |
| 31 | LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { | 31 | LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { |
| 32 | mount -n -o mode=0755 -t tmpfs none "/dev" | 32 | mount -n -o mode=0755 -t tmpfs none "/dev" |
| 33 | mkdir -m 0755 /dev/pts | 33 | mkdir -m 0755 /dev/pts |
| 34 | mkdir -m 1777 /dev/shm | 34 | mkdir -m 1777 /dev/shm |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | if [ -e /etc/dev.tar ]; then | 37 | if [ -e /etc/dev.tar ]; then |
| @@ -42,18 +42,18 @@ fi | |||
| 42 | # make_extra_nodes | 42 | # make_extra_nodes |
| 43 | kill_udevd > "/dev/null" 2>&1 | 43 | kill_udevd > "/dev/null" 2>&1 |
| 44 | 44 | ||
| 45 | # trigger the sorted events | 45 | # trigger the sorted events |
| 46 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug | 46 | echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug |
| 47 | /sbin/udevd -d | 47 | /sbin/udevd -d |
| 48 | 48 | ||
| 49 | /sbin/udevadm control --env=STARTUP=1 | 49 | /sbin/udevadm control --env=STARTUP=1 |
| 50 | if [ "$not_first_boot" != "" ];then | 50 | if [ "$not_first_boot" != "" ];then |
| 51 | /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 | 51 | /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 |
| 52 | (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& | 52 | (/sbin/udevadm settle --timeout=3; /sbin/udevadm control --env=STARTUP=)& |
| 53 | else | 53 | else |
| 54 | /sbin/udevadm trigger --action=add | 54 | /sbin/udevadm trigger --action=add |
| 55 | /sbin/udevadm settle | 55 | /sbin/udevadm settle |
| 56 | fi | 56 | fi |
| 57 | 57 | ||
| 58 | echo | 58 | echo |
| 59 | exit 0 | 59 | exit 0 |
