Patchwork wpa-supplicant: don't let postinst fail when dbus-1 reload fails

login
register
mail settings
Submitter Martin Jansa
Date May 24, 2012, 8:51 p.m.
Message ID <1337892697-5489-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/28651/
State Accepted
Commit 96a1b26c62ef33f6d10fe7ac9dcf5f93c683d6e8
Headers show

Comments

Martin Jansa - May 24, 2012, 8:51 p.m.
* e.g. when upgrading in chroot
  Configuring wpa-supplicant.
  Reloading system message bus config: Failed to open connection to system message bus: Failed to connect to socket /var/run/dbus/system_bus_socket: Connection refused
  but that shouldn't be fatal

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../wpa-supplicant/wpa-supplicant-0.7.inc          |    2 +-
 .../wpa-supplicant/wpa-supplicant_0.7.3.bb         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - May 25, 2012, 4:25 p.m.
On 05/24/2012 01:51 PM, Martin Jansa wrote:
> * e.g. when upgrading in chroot
>    Configuring wpa-supplicant.
>    Reloading system message bus config: Failed to open connection to system message bus: Failed to connect to socket /var/run/dbus/system_bus_socket: Connection refused
>    but that shouldn't be fatal
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   .../wpa-supplicant/wpa-supplicant-0.7.inc          |    2 +-
>   .../wpa-supplicant/wpa-supplicant_0.7.3.bb         |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> index efd1a66..6c84202 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
> @@ -74,6 +74,6 @@ pkg_postinst_wpa-supplicant () {
>   	DBUSPID=`pidof dbus-daemon`
>
>   	if [ "x$DBUSPID" != "x" ]; then
> -		/etc/init.d/dbus-1 reload
> +		/etc/init.d/dbus-1 reload || true
>   	fi
>   }
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> index 7bbb8c0..6f6378b 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
> @@ -1,6 +1,6 @@
>   require wpa-supplicant-0.7.inc
>
> -PR = "r11"
> +PR = "r12"
>
>   SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
>   SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index efd1a66..6c84202 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -74,6 +74,6 @@  pkg_postinst_wpa-supplicant () {
 	DBUSPID=`pidof dbus-daemon`
 
 	if [ "x$DBUSPID" != "x" ]; then
-		/etc/init.d/dbus-1 reload
+		/etc/init.d/dbus-1 reload || true
 	fi
 }
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 7bbb8c0..6f6378b 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@ 
 require wpa-supplicant-0.7.inc
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
 SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"