[oe-commits] Mike Westerhof : dbus: fix post-install script to change ownership _after_ group and id is created .

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 528a20267a8a8b9e77f77394654070590c9ee9aa
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=528a20267a8a8b9e77f77394654070590c9ee9aa

Author: Mike Westerhof <mwester at dls.net>
Date:   Thu Feb 19 23:33:44 2009 -0600

dbus: fix post-install script to change ownership _after_ group and id is created.

---

 packages/dbus/dbus.inc      |    6 ++++--
 packages/dbus/dbus_1.0.3.bb |    2 +-
 packages/dbus/dbus_1.2.1.bb |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 64ef21c..047b33a 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -79,8 +79,10 @@ fi
 MESSAGEUSER=messagebus
 MESSAGEHOME=/var/run/dbus
 mkdir -p $MESSAGEHOME || 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"
+grep -q ^$MESSAGEUSER: /etc/group || addgroup "$MESSAGEUSER"
+chgrp "$MESSAGEUSER" "$MESSAGEHOME"
+grep -q ^$MESSAGEUSER: /etc/passwd || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME"
 grep -q netdev: /etc/group || addgroup netdev
 chmod u+s /usr/libexec/dbus-daemon-launch-helper
 }
diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb
index 6f71d06..2589cfe 100644
--- a/packages/dbus/dbus_1.0.3.bb
+++ b/packages/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-PR = "r15"
+PR = "r16"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index e14523d..2a663f4 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r9"
+PR = "r10"