diff --git a/srcpkgs/dbus/files/dbus.rc b/srcpkgs/dbus/files/dbus.rc deleted file mode 100644 index 94057d1e285..00000000000 --- a/srcpkgs/dbus/files/dbus.rc +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript - -command=/usr/bin/dbus-daemon -pidfile=/var/run/dbus/pid -: ${command_args:=--system} - -depend() -{ - need localmount net - after bootmisc -} - -start_pre() -{ - dir=$(dirname $pidfile) - if [ ! -d $dir ]; then - mkdir $dir - chmod 0755 $dir - chown dbus:dbus $dir - fi - dbus-uuidgen --ensure -} diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 59399c7e5ca..8174383d65d 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -1,6 +1,7 @@ # Template file for 'dbus' pkgname=dbus version=1.4.16 +revision=1 homepage="http://dbus.freedesktop.org/" distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -25,7 +26,7 @@ long_desc=" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" subpackages="$pkgname-devel $pkgname-libs" -openrc_services="dbus default true" +systemd_services="dbus.service" system_accounts="dbus" Add_dependency run glibc @@ -44,6 +45,4 @@ post_install() vinstall tools/dbus-launch 755 usr/bin vinstall doc/dbus-launch.1 644 usr/share/man/man1 vinstall ${FILESDIR}/30-dbus-xinit 755 etc/X11/xinit/xinitrc.d 30-dbus - # Install the OpenRC service - vinstall ${FILESDIR}/dbus.rc 755 etc/init.d dbus }