From 2aed6cf3217a325847353620e7885345fb5a89e4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 17 Jul 2012 16:52:34 +0200 Subject: [PATCH] systemd: local-d.service improvements. 1- Enable it by default but give a chance to also disable it. 2- Rather than passing ACTION via envvar, pass it as first argument in run-parts. --- srcpkgs/systemd/files/local-d.service | 4 ++-- srcpkgs/systemd/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/systemd/files/local-d.service b/srcpkgs/systemd/files/local-d.service index 0c075817db1..5e8db772bb9 100644 --- a/srcpkgs/systemd/files/local-d.service +++ b/srcpkgs/systemd/files/local-d.service @@ -3,8 +3,8 @@ Description=/etc/local.d execution [Service] Type=oneshot -ExecStart=/usr/bin/env -i ACTION=start /usr/bin/run-parts /etc/local.d -ExecStop=/usr/bin/env -i ACTION=stop /usr/bin/run-parts --reverse /etc/local.d +ExecStart=/usr/bin/run-parts --arg="start" /etc/local.d +ExecStop=/usr/bin/run-parts --arg="stop" --reverse /etc/local.d TimeoutSec=0 RemainAfterExit=yes diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index a8d2e8ff29d..f173f2e714a 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=186 -revision=2 +revision=3 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--with-distro=other --libexecdir=/usr/lib @@ -86,5 +86,5 @@ post_install() { # Install and enable local-d.service for multi-user.target by default. vinstall ${FILESDIR}/local-d.service 644 usr/lib/systemd/system ln -sf /usr/lib/systemd/system/local-d.service \ - ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/local-d.service + ${DESTDIR}/etc/systemd/system/multi-user.target.wants/local-d.service }