Patchwork dbus 1.4.1: create UUIDDIR in postinst

login
register
mail settings
Submitter Koen Kooi
Date May 27, 2011, 1:40 p.m.
Message ID <1306503625-719-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/4901/
State New, archived
Headers show

Comments

Koen Kooi - May 27, 2011, 1:40 p.m.
This fixes dbus usage in non-sysV init systems.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/dbus/dbus.inc      |    4 ++++
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
Koen Kooi - May 27, 2011, 1:42 p.m.
For the attentive reader, the sysV script still has the check for the dir, so it will get created if it fails for some reason in the postinst. Cleaning up the sysV cript is a bigger task for another day.

Op 27 mei 2011, om 15:40 heeft Koen Kooi het volgende geschreven:

> This fixes dbus usage in non-sysV init systems.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-core/dbus/dbus.inc      |    4 ++++
> meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
> 2 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index 2a5f8bd..75a4d9d 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -49,13 +49,17 @@ pkg_postinst_dbus() {
> 
> 	MESSAGEUSER=messagebus
> 	MESSAGEHOME=/var/run/dbus
> +	UUIDDIR=/var/lib/dbus
> 
> 	mkdir -p $MESSAGEHOME || true
> +	mkdir -p $UUIDDIR || true
> 	chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
> 	chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
> 		adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
> 			--ingroup "$MESSAGEUSER" "$MESSAGEUSER"
> 
> +	chown "$MESSAGEUSER"."$MESSAGEUSER" "$UUIDDIR"
> +
> 	grep -q netdev: /etc/group || addgroup netdev
> 
> 	chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper
> diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
> index 1c8aeaa..f65ef35 100644
> --- a/meta/recipes-core/dbus/dbus_1.4.1.bb
> +++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
> @@ -1,6 +1,6 @@
> include dbus.inc
> 
> -PR = "r4"
> +PR = "r5"
> 
> SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
> SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
> -- 
> 1.6.6.1
>
Phil Blundell - May 27, 2011, 1:47 p.m.
On Fri, 2011-05-27 at 15:40 +0200, Koen Kooi wrote:
> +	mkdir -p $UUIDDIR || true

Why "|| true"?  If this creation fails then the following chown will
surely fail as well, except with a different and less illuminating error
message.

> +     chown "$MESSAGEUSER"."$MESSAGEUSER" "$UUIDDIR"

The dot syntax is nonstandard and obsolescent.  It would be better to
use ":" there.

p.
Koen Kooi - May 27, 2011, 1:55 p.m.
Op 27 mei 2011, om 15:47 heeft Phil Blundell het volgende geschreven:

> On Fri, 2011-05-27 at 15:40 +0200, Koen Kooi wrote:
>> +	mkdir -p $UUIDDIR || true
> 
> Why "|| true"?  If this creation fails then the following chown will
> surely fail as well, except with a different and less illuminating error
> message.
> 
>> +     chown "$MESSAGEUSER"."$MESSAGEUSER" "$UUIDDIR"
> 
> The dot syntax is nonstandard and obsolescent.  It would be better to
> use ":" there.

I matched the postinst for these additionsm, but I can cleanup the complete postinst if you wish.

regards,

Koen
Phil Blundell - May 27, 2011, 3:13 p.m.
On Fri, 2011-05-27 at 15:55 +0200, Koen Kooi wrote:
> I matched the postinst for these additionsm, but I can cleanup the complete postinst if you wish.

I see you did that already in your v2 patch.  Thanks.

p.

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a5f8bd..75a4d9d 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -49,13 +49,17 @@  pkg_postinst_dbus() {
 
 	MESSAGEUSER=messagebus
 	MESSAGEHOME=/var/run/dbus
+	UUIDDIR=/var/lib/dbus
 
 	mkdir -p $MESSAGEHOME || true
+	mkdir -p $UUIDDIR || true
 	chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 	chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
 		adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
 			--ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
+	chown "$MESSAGEUSER"."$MESSAGEUSER" "$UUIDDIR"
+
 	grep -q netdev: /etc/group || addgroup netdev
 
 	chown root:"$MESSAGEUSER" /usr/libexec/dbus-daemon-launch-helper
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index 1c8aeaa..f65ef35 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@ 
 include dbus.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
 SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"