Patchwork [v2] dbus 1.4.1: create UUIDDIR in postinst

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

Comments

Koen Kooi - May 27, 2011, 2:41 p.m.
This fixes dbus usage in non-sysV init systems. Volatiles aren't needed in systemd land, since /run is tmpfs and the dbus units take care of all this.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---

Changes since v1:

	* addressed pbs concerns about the || true and chgrp dots
	* check for volatiles before trying to run the script

 meta/recipes-core/dbus/dbus.inc      |   12 +++++++++---
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
Richard Purdie - May 27, 2011, 3:35 p.m.
On Fri, 2011-05-27 at 16:41 +0200, Koen Kooi wrote:
> This fixes dbus usage in non-sysV init systems. Volatiles aren't needed in systemd land, since /run is tmpfs and the dbus units take care of all this.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> 
> Changes since v1:
> 
> 	* addressed pbs concerns about the || true and chgrp dots
> 	* check for volatiles before trying to run the script
> 
>  meta/recipes-core/dbus/dbus.inc      |   12 +++++++++---
>  meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
>  2 files changed, 10 insertions(+), 4 deletions(-)

Applied to master, thanks.

Richard

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a5f8bd..38acf35 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 $MESSAGEHOME
+	mkdir -p $UUIDDIR
 	chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-	chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
+	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
@@ -63,7 +67,9 @@  pkg_postinst_dbus() {
 
 	# add volatile after new user/grp are created
 	echo "d messagebus messagebus 0755 /var/run/dbus none" > /etc/default/volatiles/99_dbus
-	/etc/init.d/populate-volatile.sh update
+	if [ -e /etc/init.d/populate-volatile.sh ] ; then
+		/etc/init.d/populate-volatile.sh update
+	fi
 }
 
 EXTRA_OECONF_X = "--with-x"
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"