mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] systemd: use install_alternative_tree
Date: Fri, 16 Nov 2012 11:47:12 +0100	[thread overview]
Message-ID: <20121116104712.GE19823@pengutronix.de> (raw)
In-Reply-To: <1352926290-28469-1-git-send-email-george.mccollister@gmail.com>

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

  reply	other threads:[~2012-11-16 10:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-14 20:51 George McCollister
2012-11-16 10:47 ` Michael Olbrich [this message]
2012-11-28 18:45   ` George McCollister
2012-11-29 14:37     ` George McCollister

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121116104712.GE19823@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox