From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XZJi3-0007Be-Su for ptxdist@pengutronix.de; Wed, 01 Oct 2014 15:12:47 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1XZJi3-0003RB-RR for ptxdist@pengutronix.de; Wed, 01 Oct 2014 15:12:47 +0200 Date: Wed, 1 Oct 2014 15:12:47 +0200 From: Michael Olbrich Message-ID: <20141001131247.GJ16481@pengutronix.de> References: <1412050724-11845-1-git-send-email-jon@ringle.org> <20140930081226.GE24288@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [ptxdist] [PATCH 1/2] systemd: install_alternative_tree /lib/systemd/system/ Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Oct 01, 2014 at 08:06:42AM -0400, Jon Ringle wrote: > On Tue, Sep 30, 2014 at 4:12 AM, Michael Olbrich > wrote: > > > On Tue, Sep 30, 2014 at 12:18:43AM -0400, jon@ringle.org wrote: > > > From: Jon Ringle > > > > > > This allows platform specific customizations to /lib/systemd/system/ to > > > be installed on the target > > > > > > Signed-off-by: Jon Ringle > > > --- > > > rules/systemd.make | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/rules/systemd.make b/rules/systemd.make > > > index ff3d606..51ffcac 100644 > > > --- a/rules/systemd.make > > > +++ b/rules/systemd.make > > > @@ -303,7 +303,7 @@ ifdef PTXCONF_SYSTEMD_NETWORK > > > endif > > > > > > # # units > > > - @$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/) > > > + @$(call install_alternative_tree, systemd, 0, 0, > > /lib/systemd/system/) > > > > Are you sure, this is what you want? install_alternative_tree replaces the > > entire tree, not individual files. You can overwrite individual files by > > placing your copy in /etc/systemd/system/. > > > > > Normally, systemd enable/disable will create/remove a symlink from > /etc/systemd/system/ to the corresponding file in /lib/systemd/system/. If > I put a real file in /etc/systemd/system/, how will systemd handle > enable/disable of a service? enable/disable creates links in /etc/systemd/system/*.wants/, so that will not clash. Only mask/unmask creates symlinks (to /dev/null) in /etc/systemd/system/. But in my experience masking core systemd units is rarely needed. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de