Re: [ptxdist] [PATCH v3] chrony: Fix location of config files

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Apr 23, 2021 at 07:33:45AM +0200, Bruno Thomsen wrote:
> Den man. 19. apr. 2021 kl. 18.31 skrev Uwe Kleine-König
> <u.kleine-koenig@pengutronix.de>:
> >
> > chrony uses /etc/chrony.conf since (at least) the start of its git history
> > in 2006.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> The old /etc/chrony/chrony.{conf,keys} locations are also in the help text
> in Kconfig (rules/chrony.in), but if that is also updated the patch looks good.

And the old locations are used in projectroot/etc/init.d/chrony. That needs
to be changed as well.

Michael

> Reviewed-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> 
> > ---
> >  rules/chrony.make | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/rules/chrony.make b/rules/chrony.make
> > index 7cf59f30560c..49177e96fcb7 100644
> > --- a/rules/chrony.make
> > +++ b/rules/chrony.make
> > @@ -100,14 +100,14 @@ endif
> >
> >  # generic one
> >  ifdef PTXCONF_CHRONY_INSTALL_CONFIG
> > -       @$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony/chrony.conf)
> > -       @$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony/chrony.keys)
> > +       @$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony.conf)
> > +       @$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony.keys)
> >
> >  # modify placeholders with data from configuration
> > -       @$(call install_replace, chrony, /etc/chrony/chrony.conf, \
> > +       @$(call install_replace, chrony, /etc/chrony.conf, \
> >                 @UNCONFIGURED_CHRONY_SERVER_IP@, $(PTXCONF_CHRONY_DEFAULT_NTP_SERVER))
> >
> > -       @$(call install_replace, chrony, /etc/chrony/chrony.keys, \
> > +       @$(call install_replace, chrony, /etc/chrony.keys, \
> >                 @UNCONFIGURED_CHRONY_ACCESS_KEY@, $(PTXCONF_CHRONY_DEFAULT_ACCESS_KEY))
> >  endif
> >
> > --
> > 2.30.2
> >
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de