From dd7332ca42bff2f160830175ac69c60b3e960bc3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 12 Jul 2013 23:45:53 +0200 Subject: [PATCH] dbus: add tmpfiles.d support, remove creating of /var/lib/dbus/machine-id here, we already have /etc/machine-id, so use this Signed-off-by: Stephan Raue --- packages/sysutils/dbus/init.d/14_dbus | 3 --- .../sysutils/dbus/tmpfiles.d/14_dbus.conf | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 packages/sysutils/dbus/tmpfiles.d/14_dbus.conf diff --git a/packages/sysutils/dbus/init.d/14_dbus b/packages/sysutils/dbus/init.d/14_dbus index 569fe651a4..c2442b487a 100644 --- a/packages/sysutils/dbus/init.d/14_dbus +++ b/packages/sysutils/dbus/init.d/14_dbus @@ -25,9 +25,6 @@ ( progress "Starting D-BUS" - - mkdir -p /var/lib/dbus /var/run/dbus - dbus-uuidgen --ensure while true; do dbus-daemon --system --nofork &>/dev/null rm /var/run/dbus/pid &>/dev/null diff --git a/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf new file mode 100644 index 0000000000..3a620aec44 --- /dev/null +++ b/packages/sysutils/dbus/tmpfiles.d/14_dbus.conf @@ -0,0 +1,24 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +d /var/lib/dbus 0755 root root 10d - +d /var/run/dbus 0755 root root 10d - + +L /var/lib/dbus/machine-id - - - - /etc/machine-id