[meta-selinux][PATCH] udev/init: fix the invalid binary path

[meta-selinux][PATCH] udev/init: fix the invalid binary path

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

The invalid binary path causes failure:
udevd[102]: starting version 182
/etc/rcS.d/S04udev: line 106: /usr/bin/udevadm: No such file or directory

use the command 'udevadm' directly in the init just as the oe-core one does.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 recipes-core/udev/udev/init |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes-core/udev/udev/init b/recipes-core/udev/udev/init
index a96638f..29146ec 100644
--- a/recipes-core/udev/udev/init
+++ b/recipes-core/udev/udev/init
@@ -103,13 +103,13 @@ case "$1" in
     echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
     @UDEVD@ -d
 
-    /usr/bin/udevadm control --env=STARTUP=1
+    udevadm control --env=STARTUP=1
     if [ "$not_first_boot" != "" ];then
-            /usr/bin/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
-            (/usr/bin/udevadm settle --timeout=10; /usr/bin/udevadm control --env=STARTUP=)&
+            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
+            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
     else
-            /usr/bin/udevadm trigger --action=add
-            /usr/bin/udevadm settle
+            udevadm trigger --action=add
+            udevadm settle
     fi
 
     test ! -x /sbin/restorecon || /sbin/restorecon -F /dev
-- 
1.7.9.5

Re: [meta-selinux][PATCH] udev/init: fix the invalid binary path

[Pascal Ouyang]

于 14-1-22 下午2:17, jackie.huang@windriver.com 写道:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> The invalid binary path causes failure:
> udevd[102]: starting version 182
> /etc/rcS.d/S04udev: line 106: /usr/bin/udevadm: No such file or directory
> 
> use the command 'udevadm' directly in the init just as the oe-core one does.
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
>   recipes-core/udev/udev/init |   10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes-core/udev/udev/init b/recipes-core/udev/udev/init
> index a96638f..29146ec 100644
> --- a/recipes-core/udev/udev/init
> +++ b/recipes-core/udev/udev/init
> @@ -103,13 +103,13 @@ case "$1" in
>       echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
>       @UDEVD@ -d
>   
> -    /usr/bin/udevadm control --env=STARTUP=1
> +    udevadm control --env=STARTUP=1
>       if [ "$not_first_boot" != "" ];then
> -            /usr/bin/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
> -            (/usr/bin/udevadm settle --timeout=10; /usr/bin/udevadm control --env=STARTUP=)&
> +            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
> +            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
>       else
> -            /usr/bin/udevadm trigger --action=add
> -            /usr/bin/udevadm settle
> +            udevadm trigger --action=add
> +            udevadm settle
>       fi
>   
>       test ! -x /sbin/restorecon || /sbin/restorecon -F /dev
> 

This is ok, I will add a ref to oe-core commit:

http://git.openembedded.org/openembedded-core/commit/?id=cc0f22cd1e93cc25647add1a3339e150572e4fce

And change you message and merge.

Thanks. :)
-- 
- Pascal