Patchwork udev: fix init script for the location of udevd

login
register
mail settings
Submitter Saul Wold
Date April 9, 2013, 4:08 p.m.
Message ID <1365523730-15141-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/47733/
State Accepted
Commit 25ff5960e41b9d7c62b05a08dd77cf11390962a1
Headers show

Comments

Saul Wold - April 9, 2013, 4:08 p.m.
Ensure we can update the script base don the location of the udevd installation

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/udev/udev.inc        | 2 ++
 meta/recipes-core/udev/udev/init       | 4 ++--
 meta/recipes-core/udev/udev/udev-cache | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
Otavio Salvador - April 9, 2013, 4:33 p.m.
On Tue, Apr 9, 2013 at 1:08 PM, Saul Wold <sgw@linux.intel.com> wrote:
> Ensure we can update the script base don the location of the udevd installation
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

This does not work as we have systemd-udevd as possible binary.
Besides, there's a type in the commit log "don the location" ;-)

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Ross Burton - April 9, 2013, 5 p.m.
On 9 April 2013 17:33, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Tue, Apr 9, 2013 at 1:08 PM, Saul Wold <sgw@linux.intel.com> wrote:
>> Ensure we can update the script base don the location of the udevd installation
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
> This does not work as we have systemd-udevd as possible binary.

But these changes are in the "udev" package, so will only be used on
systems which are booting udev.

Related, all of the changes happening to udev need to happen to systemd aswell.

Ross
Otavio Salvador - April 9, 2013, 5:06 p.m.
On Tue, Apr 9, 2013 at 2:00 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 9 April 2013 17:33, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> On Tue, Apr 9, 2013 at 1:08 PM, Saul Wold <sgw@linux.intel.com> wrote:
>>> Ensure we can update the script base don the location of the udevd installation
>>>
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>
>> This does not work as we have systemd-udevd as possible binary.
>
> But these changes are in the "udev" package, so will only be used on
> systems which are booting udev.
>
> Related, all of the changes happening to udev need to happen to systemd aswell.

The init-live problem people are concerned about is not fixed for
systemd-udevd as well.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index c4d2ce4..d025458 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -79,6 +79,8 @@  do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 	install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+	sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev
+	sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache
 
 	install -d ${D}${sysconfdir}/default
 	install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 95d2672..37b5231 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -15,7 +15,7 @@  export TZ=/etc/localtime
 
 [ -d /sys/class ] || exit 1
 [ -r /proc/mounts ] || exit 1
-[ -x /lib/udev/udevd ] || exit 1
+[ -x @UDEVD@ ] || exit 1
 [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
 [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
 
@@ -71,7 +71,7 @@  case "$1" in
 
     # trigger the sorted events
     echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-    /lib/udev/udevd -d
+    @UDEVD@ -d
 
     /usr/bin/udevadm control --env=STARTUP=1
     if [ "$not_first_boot" != "" ];then
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache
index 0f3d7cd..01fec6e 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -12,7 +12,7 @@ 
 export TZ=/etc/localtime
 
 [ -r /proc/mounts ] || exit 1
-[ -x /lib/udev/udevd ] || exit 1
+[ -x @UDEVD@ ] || exit 1
 [ -d /sys/class ] || exit 1
 
 [ -f /etc/default/udev-cache ] && . /etc/default/udev-cache