summaryrefslogtreecommitdiff
path: root/packages/dbus
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2009-02-20 12:05:35 -0500
committerCliff Brake <cbrake@bec-systems.com>2009-02-20 12:05:35 -0500
commitab066eb3b73656186a445667aa4f8c46b48644b3 (patch)
treed3b964b9c48ef1a6fce2d48534d1a8367df40768 /packages/dbus
parentd512927cbf42dc9a3302ecac790a18d397ea012f (diff)
parentb8215aff2a8d11d99368d7794785b08a6fc0ed4c (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/dbus')
-rw-r--r--packages/dbus/dbus.inc6
-rw-r--r--packages/dbus/dbus_1.0.3.bb2
-rw-r--r--packages/dbus/dbus_1.2.1.bb2
3 files changed, 6 insertions, 4 deletions
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 64ef21cbd4..047b33a71c 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 6f71d062ce..2589cfef53 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 e14523daaf..2a663f4bfa 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"