org.openembedded.dev: 2a64651f43431cae21806db78517b7481f421733

oe at monotone.openmoko.org oe at monotone.openmoko.org
Fri May 2 20:53:35 CEST 2008


revision:            2a64651f43431cae21806db78517b7481f421733
date:                2008-05-02T13:00:40
author:              mickeyl at openembedded.org
branch:              org.openembedded.dev
changelog:
dbus 1.2.1 bring some sanity in the init script, e.g.
* don't hide problems
* use proper PID files
* allow restart

manifest:
format_version "1"

new_manifest [16a6fd15dda631368ddfe0d8343f1f6a54b0958f]

old_revision [3949cfbd788dc247b3f92e782bf24d987289e938]

patch "packages/dbus/dbus-1.2.1/dbus-1.init"
 from [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
   to [83cadc2d6562bfb296418a8dc698f37ff6e05154]

patch "packages/dbus/dbus_1.2.1.bb"
 from [a941688e3a8621769a37bb46e79d4f2d5764966a]
   to [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
-------------- next part --------------
#
#
# patch "packages/dbus/dbus-1.2.1/dbus-1.init"
#  from [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#    to [83cadc2d6562bfb296418a8dc698f37ff6e05154]
# 
# patch "packages/dbus/dbus_1.2.1.bb"
#  from [a941688e3a8621769a37bb46e79d4f2d5764966a]
#    to [13d62bf774c4fbb379fe51e709aa9044ae5084e9]
#
============================================================
--- packages/dbus/dbus-1.2.1/dbus-1.init	9bdceca2b1986db6ec905e8b53e6402be0b88e9a
+++ packages/dbus/dbus-1.2.1/dbus-1.init	83cadc2d6562bfb296418a8dc698f37ff6e05154
@@ -2,14 +2,15 @@
 # -*- coding: utf-8 -*-
 # Debian init.d script for D-BUS
 # Copyright © 2003 Colin Walters <walters at debian.org>
+# Copyright 2008 OE Team
 
 set -e
 
 DAEMON=/usr/bin/dbus-daemon
 NAME=dbus
 DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
+RUNDIR=/var/run/dbus
+PIDFILE=/var/run/messagebus.pid
 UUIDDIR=/var/lib/dbus
 DESC="system message bus"
 EVENTDIR=/etc/dbus-1/event.d
@@ -27,10 +28,10 @@ start_it_up()
 
 start_it_up()
 {
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
+  if [ ! -d $RUNDIR ]; then
+    mkdir -p $RUNDIR
+    chown $DAEMONUSER $RUNDIR
+    chgrp $DAEMONUSER $RUNDIR
   fi
   if [ -e $PIDFILE ]; then
     PIDDIR=/proc/$(cat $PIDFILE)
@@ -51,7 +52,7 @@ start_it_up()
   dbus-uuidgen --ensure  
 
   echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+  start-stop-daemon --start --pidfile $PIDFILE \
     --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
   echo "$NAME."
   if [ -d $EVENTDIR ]; then
@@ -66,7 +67,7 @@ shut_it_down()
       run-parts --arg=stop $EVENTDIR
   fi
   echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+  start-stop-daemon --stop --oknodo --pidfile $PIDFILE \
     --user $DAEMONUSER
   # We no longer include these arguments so that start-stop-daemon
   # can do its job even given that we may have been upgraded.
============================================================
--- packages/dbus/dbus_1.2.1.bb	a941688e3a8621769a37bb46e79d4f2d5764966a
+++ packages/dbus/dbus_1.2.1.bb	13d62bf774c4fbb379fe51e709aa9044ae5084e9
@@ -1,3 +1,3 @@ include dbus.inc
 include dbus.inc
 
+PR = "r1"
-PR = "r0"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/62360d5d/attachment.htm 


More information about the commitlog mailing list