From 01cda1daad9e3a480166236be35156209a53e5b3 Mon Sep 17 00:00:00 2001 From: kueller Date: Mon, 27 Apr 2009 11:14:47 +0000 Subject: [PATCH] =?UTF-8?q?Anpassung=20an=20neue=20Version.=20Startup=20na?= =?UTF-8?q?ch=20cblfs=20vorgaben=20ver=C3=A4ndert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.compuextreme.de/Viitor/V962/Viitor_dbus@4633 504e572c-2e33-0410-9681-be2bf7408885 --- etc/init.d/dbus | 8 +------- tmp/postinstall | 8 ++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/etc/init.d/dbus b/etc/init.d/dbus index d25f34d..0b56f7c 100755 --- a/etc/init.d/dbus +++ b/etc/init.d/dbus @@ -68,12 +68,7 @@ case "$1" in fi export PATH=$PATH:/usr/X11R7/bin echo -n "Starting dbus messaging system" - dbus-launch --config-file /etc/sysconfig/dbus/dbus-1/system.conf >/tmp/dbus_startup && \ - source /tmp/dbus_startup && \ - rm /tmp/dbus_startup && \ - echo $DBUS_SESSION_BUS_PID >/var/run/dbus/pid && \ - echo "DBUS_SESSION_BUS_ADDRESS='$DBUS_SESSION_BUS_ADDRESS'" \ - >/var/run/dbus/address + dbus-daemon --system evaluate_retval ;; @@ -85,7 +80,6 @@ case "$1" in echo -n "Stopping dbus messaging system" kill `cat /var/run/dbus/pid` && rm /var/run/dbus/pid && - rm /var/run/dbus/address evaluate_retval ;; diff --git a/tmp/postinstall b/tmp/postinstall index 68c1135..74aa997 100644 --- a/tmp/postinstall +++ b/tmp/postinstall @@ -41,6 +41,10 @@ #neue postinstall installiert den in der neuen version erwarteten user messagebus # -if ! getent passwd messagebus 2>&1 >/dev/null; then - useradd -u 42 messagebus -g daemon -s /bin/false -d /tmp +if ! getent group messagebus 2>&1 >/dev/null; then + groupadd -g 42 messagebus fi +if ! getent passwd messagebus 2>&1 >/dev/null; then + useradd -u 42 messagebus -g messagebus -s /bin/false -d /tmp +fi +dbus-uuidgen --ensure