From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10]
	ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1TZJS4-00071g-B7
	for ptxdist@pengutronix.de; Fri, 16 Nov 2012 11:47:12 +0100
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1TZJS4-0005hh-Av
	for ptxdist@pengutronix.de; Fri, 16 Nov 2012 11:47:12 +0100
Date: Fri, 16 Nov 2012 11:47:12 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20121116104712.GE19823@pengutronix.de>
References: <1352926290-28469-1-git-send-email-george.mccollister@gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1352926290-28469-1-git-send-email-george.mccollister@gmail.com>
Subject: Re: [ptxdist] [PATCH] systemd: use install_alternative_tree
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=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, Nov 14, 2012 at 02:51:30PM -0600, George McCollister wrote:
> The contents of the following often need to be customized:
>  /etc/systemd/system

What do you need to change here?

>  /lib/systemd/system

This makes no sense. install_alternative_tree chooses the whole tree from
multiple locations, not individual files. Copying the whole tree is really
overkill. You can overwrite anything here by installing the same files in
/etc/systemd/system anyways.

>  /usr/lib/tmpfiles.d

No. These are needed and you can add your own files in a separate package.

Michael

> Using install_alternative_tree instead of install_tree will allow
> customizations.
> 
> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> ---
>  rules/systemd.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 4d3cace..0f78553 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -199,8 +199,8 @@ endif
>  		/etc/systemd/journald.conf)
>  	@$(call install_alternative, systemd, 0, 0, 0644, \
>  		/etc/systemd/logind.conf)
> -	@$(call install_tree, systemd, 0, 0, -, /etc/systemd/system/)
> -	@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
> +	@$(call install_alternative_tree, systemd, 0, 0, /etc/systemd/system/)
> +	@$(call install_alternative_tree, systemd, 0, 0, /usr/lib/tmpfiles.d/)
>  	@$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/rules.d/99-systemd.rules)
>  	@$(call install_tree, systemd, 0, 0, -, /etc/dbus-1/system.d/)
>  	@$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1/actions/)
> @@ -209,7 +209,7 @@ endif
>  	@$(call install_copy, systemd, 0, 0, 0644, -, /usr/share/systemd/kbd-model-map)
>  
>  #	# units
> -	@$(call install_tree, systemd, 0, 0, -, /lib/systemd/system/)
> +	@$(call install_alternative_tree, systemd, 0, 0, /lib/systemd/system/)
>  
>  	@$(call install_alternative, systemd, 0, 0, 0644, /etc/vconsole.conf)
>  
> -- 
> 1.7.11.2
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
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