From patchwork Thu Dec 22 12:43:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,4/9] udev: use tabs for init script (no code changes) Date: Thu, 22 Dec 2011 12:43:24 -0000 From: Otavio Salvador X-Patchwork-Id: 17477 Message-Id: <3fb984915eb445a2429aaede539e45f559c5f2e9.1324557763.git.otavio@ossystems.com.br> To: openembedded-core@lists.openembedded.org Signed-off-by: Otavio Salvador --- 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 073942f..edc3c9a 100644 --- a/meta/recipes-core/udev/udev/init +++ b/meta/recipes-core/udev/udev/init @@ -17,10 +17,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 @@ -29,9 +29,9 @@ echo -n "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 + mount -n -o mode=0755 -t tmpfs none "/dev" + mkdir -m 0755 /dev/pts + mkdir -m 1777 /dev/shm } if [ -e /etc/dev.tar ]; then @@ -42,18 +42,18 @@ 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 - - /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 +# 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