Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=548cb93f9c032fecea5f73a9209a350bbb98f8bc
commit 548cb93f9c032fecea5f73a9209a350bbb98f8bc Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Nov 28 18:50:18 2010 +0000 dbus-1.4.0-4-i686 *clean up *switch to systemd *no necessary to create /var/run/console, systemd create it with console.conf diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild index ea25382..fb9a4cb 100644 --- a/source/base/dbus/FrugalBuild +++ b/source/base/dbus/FrugalBuild @@ -3,7 +3,7 @@ pkgname=dbus pkgver=1.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="A message bus system" url="http://freedesktop.org/wiki/Software_2fdbus"; depends=('libxml2' 'expat') @@ -13,9 +13,8 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar" source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \ - rc.$pkgname dbus-1-launch dbus-1-launch.desktop) + dbus-1-launch dbus-1-launch.desktop) sha1sums=('4be3281005a9ef8f521f5547128c29a2632cb1d7' \ - 'b624f50a56ac56c6d6fbe0a9873c4672d3584e02' \ '740af74eb43cadf1277346029577aadd3d10f2b5' \ 'da9efab479aa3a2a8fb365a89ed658646486c39f') @@ -57,9 +56,7 @@ build() --disable-tests \ --disable-selinux \ --with-systemdsystemunitdir=/lib/systemd/system/ - Frcd2 - ## not sure about that - Fmkdir /var/run/console + ## DO NOT change that without to ask the Maintainer! ## ## Install wrapper diff --git a/source/base/dbus/dbus.install b/source/base/dbus/dbus.install index 9aff8bb..5dff352 100644 --- a/source/base/dbus/dbus.install +++ b/source/base/dbus/dbus.install @@ -11,9 +11,6 @@ post_install() /usr/bin/dbus-uuidgen --ensure - if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then - /usr/sbin/chkconfig --add rc.dbus - fi } post_upgrade() @@ -31,13 +28,12 @@ post_upgrade() chmod 4750 /usr/lib/dbus-1/dbus-daemon-launch-helper /usr/bin/dbus-uuidgen --ensure + systemctl enable dbus.service } pre_remove() { - if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then - /usr/sbin/chkconfig --del rc.dbus - fi + systemctl delete dbus.service ## mabye already removed ? if grep -q 'messagebus' /etc/group; then /usr/sbin/userdel messagebus 2>/dev/null diff --git a/source/base/dbus/rc.dbus b/source/base/dbus/rc.dbus deleted file mode 100644 index ca4685a..0000000 --- a/source/base/dbus/rc.dbus +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# (c) 2004 Laszlo Dvornik <dvor...@gnome.hu> -# rc.dbus for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 97 03 -# description: This is a daemon which broadcasts notifications of system events -# and other messages. - -source /lib/initscripts/functions -actions=(start stop restart status) -daemon=$"system message bus" - -pid="cat /var/run/dbus/dbus.pid 2> /dev/null" - -rc_start() -{ - start_msg - # check if dbus is already running - if [ ! -z "$(eval $pid)" ]; then - ok 999 - else - ## we need that - if [ ! -d /var/run/dbus ]; then - mkdir /var/run/dbus - fi - ## that too - chown messagebus:messagebus /var/run/dbus - ## bug #860 - [ -d /usr/share/dbus-1/services ] || mkdir -p /usr/share/dbus-1/services - ## this need be here - /usr/bin/dbus-uuidgen --ensure - /usr/bin/dbus-daemon --system - ok $? - fi -} - -rc_stop() -{ - stop_msg - if [ -n "$(eval $pid)" ]; then - killall dbus-daemon - rm -f /var/run/dbus/dbus.pid - ok $? - else - ok 999 - fi -} - -rc_exec $1 - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
