Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at Thu Apr 2 17:30:10 CEST 2009. -------- --- dbus-1/dbus-1.changes 2009-02-17 17:10:27.000000000 +0100 +++ dbus-1/dbus-1.changes 2009-04-02 15:51:33.904001605 +0200 @@ -1,0 +2,5 @@ +Thu Apr 2 15:51:04 CEST 2009 - werner@suse.de + +- Make boot script smart + +------------------------------------------------------------------- dbus-1-x11.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.Nh7941/_old 2009-04-02 17:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Nh7941/_new 2009-04-02 17:29:25.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel Version: 1.2.12 -Release: 1 +Release: 2 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -285,6 +285,8 @@ %{_datadir}/susehelp %changelog +* Thu Apr 02 2009 werner@suse.de +- Make boot script smart * Tue Feb 17 2009 thoenig@suse.de - update to D-Bus 1.2.12: - fdo#17969: Don't test for abstract sockets if explicitly @@ -511,7 +513,7 @@ * Thu Nov 09 2006 thoenig@suse.de - start service for D-Bus system bus also in run level 2 (b.n.c [#216805]) -* Fri Nov 03 2006 thoenig@suse.de +* Sat Nov 04 2006 thoenig@suse.de - remove patch dbus-send-do-not-close-shared-connection-thoenig-01.patch (fix is now upstream) @@ -966,5 +968,5 @@ * Fri Nov 05 2004 thoenig@suse.de - dynamic allocation of user id user messagebus - dynamic allocation of group id for group messagebus -* Wed Oct 20 2004 thoenig@suse.de +* Thu Oct 21 2004 thoenig@suse.de - init ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.Nh7941/_old 2009-04-02 17:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Nh7941/_new 2009-04-02 17:29:25.000000000 +0200 @@ -29,7 +29,7 @@ BuildRequires: doxygen libexpat-devel libzio pkgconfig BuildRequires: audit-devel Version: 1.2.12 -Release: 1 +Release: 2 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -132,6 +132,8 @@ %{_mandir}/man1/dbus-launch.1* %changelog +* Thu Apr 02 2009 werner@suse.de +- Make boot script smart * Tue Feb 17 2009 thoenig@suse.de - update to D-Bus 1.2.12: - fdo#17969: Don't test for abstract sockets if explicitly @@ -358,7 +360,7 @@ * Thu Nov 09 2006 thoenig@suse.de - start service for D-Bus system bus also in run level 2 (b.n.c [#216805]) -* Fri Nov 03 2006 thoenig@suse.de +* Sat Nov 04 2006 thoenig@suse.de - remove patch dbus-send-do-not-close-shared-connection-thoenig-01.patch (fix is now upstream) @@ -813,5 +815,5 @@ * Fri Nov 05 2004 thoenig@suse.de - dynamic allocation of user id user messagebus - dynamic allocation of group id for group messagebus -* Wed Oct 20 2004 thoenig@suse.de +* Thu Oct 21 2004 thoenig@suse.de - init ++++++ rc.boot.dbus ++++++ --- /var/tmp/diff_new_pack.Nh7941/_old 2009-04-02 17:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Nh7941/_new 2009-04-02 17:29:25.000000000 +0200 @@ -22,11 +22,11 @@ test -x $DBUS_DAEMON_BIN || exit 5 DBUS_DAEMON_PARAMETER="--system"; -DBUS_DAEMON_PID_DIR="/var/run/dbus"; -DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid; +DBUS_DAEMON_PID_DIR="/var/run/dbus" +DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid -DBUS_MACHINE_ID_DIR="/var/lib/dbus"; -DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id; +DBUS_MACHINE_ID_DIR="/var/lib/dbus" +DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen @@ -45,36 +45,35 @@ case "$1" in start) - if [ ! -d $DBUS_MACHINE_ID_DIR ]; then - mkdir -p $DBUS_MACHINE_ID_DIR; - chown messagebus:messagebus $DBUS_MACHINE_ID_DIR; - fi - if [ ! -e $DBUS_MACHINE_ID ] && [ -x $DBUS_UUIIDGEN_BIN ]; then + if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID ] ; then + if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then + mkdir -p $DBUS_MACHINE_ID_DIR + chown messagebus:messagebus $DBUS_MACHINE_ID_DIR + fi echo -n "Creating universally unique ID..." - /bin/dbus-uuidgen --ensure; - rc_status -v; + $DBUS_UUIIDGEN_BIN --ensure + rc_status -v fi - if [ ! -d $DBUS_DAEMON_PID_DIR ]; then - mkdir -p $DBUS_DAEMON_PID_DIR; - chown messagebus:messagebus $DBUS_DAEMON_PID_DIR; + if checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN ; then + echo "D-Bus already started. Not starting." + exit 0 fi - if [ -e $DBUS_DAEMON_PID ]; then - if [ -d /proc/`cat $DBUS_DAEMON_PID` ]; then - echo "D-Bus already started. Not starting." - exit 0; - else - echo "Removing stale PID file $DBUS_DAEMON_PID."; - rm -f $DBUS_DAEMON_PID; - fi - fi - echo -n "Starting D-Bus daemon"; - $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER + if [ ! -d $DBUS_DAEMON_PID_DIR ] ; then + mkdir -p $DBUS_DAEMON_PID_DIR + chown messagebus:messagebus $DBUS_DAEMON_PID_DIR + fi + if [ -e $DBUS_DAEMON_PID ] ; then + echo "Removing stale PID file $DBUS_DAEMON_PID." + rm -f $DBUS_DAEMON_PID + fi + echo -n "Starting D-Bus daemon" + start_daemon -f $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER rc_status -v ;; stop) echo -n "Shutting down D-Bus daemon" + killproc -TERM /usr/sbin/console-kit-daemon killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN - rm -f $DBUS_DAEMON_PID; rc_status -v ;; try-restart) @@ -100,7 +99,7 @@ checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN if [ $? -eq 7 ]; then rc_failed 3 - fi; + fi rc_status -v ;; probe) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org