* [ptxdist] [PATCH] chrony: Fix location of config files
@ 2021-04-19 16:01 Uwe Kleine-König
2021-04-19 16:07 ` Roland Hieber
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2021-04-19 16:01 UTC (permalink / raw)
To: ptxdist
chrony uses /etc/chrony.conf since (at least) the start of its git history
in 2006.
---
rules/chrony.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/chrony.make b/rules/chrony.make
index 7cf59f30560c..b8e5d694de2a 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -100,8 +100,8 @@ 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, \
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] chrony: Fix location of config files
2021-04-19 16:01 [ptxdist] [PATCH] chrony: Fix location of config files Uwe Kleine-König
@ 2021-04-19 16:07 ` Roland Hieber
2021-04-19 16:10 ` [ptxdist] [PATCH v2] " Uwe Kleine-König
2021-04-19 16:30 ` [ptxdist] [PATCH v3] " Uwe Kleine-König
2 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-04-19 16:07 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: ptxdist
Hi Uwe,
On Mon, Apr 19, 2021 at 06:01:30PM +0200, Uwe Kleine-König wrote:
> chrony uses /etc/chrony.conf since (at least) the start of its git history
> in 2006.
Your S-o-b is missing here.
> ---
> rules/chrony.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 7cf59f30560c..b8e5d694de2a 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -100,8 +100,8 @@ 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, \
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH v2] chrony: Fix location of config files
2021-04-19 16:01 [ptxdist] [PATCH] chrony: Fix location of config files Uwe Kleine-König
2021-04-19 16:07 ` Roland Hieber
@ 2021-04-19 16:10 ` Uwe Kleine-König
2021-04-19 16:30 ` [ptxdist] [PATCH v3] " Uwe Kleine-König
2 siblings, 0 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2021-04-19 16:10 UTC (permalink / raw)
To: ptxdist
chrony uses /etc/chrony.conf since (at least) the start of its git history
in 2006.
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH v3] chrony: Fix location of config files
2021-04-19 16:01 [ptxdist] [PATCH] chrony: Fix location of config files Uwe Kleine-König
2021-04-19 16:07 ` Roland Hieber
2021-04-19 16:10 ` [ptxdist] [PATCH v2] " Uwe Kleine-König
@ 2021-04-19 16:30 ` Uwe Kleine-König
2021-04-23 5:33 ` Bruno Thomsen
2 siblings, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2021-04-19 16:30 UTC (permalink / raw)
To: ptxdist
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>
---
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH v3] chrony: Fix location of config files
2021-04-19 16:30 ` [ptxdist] [PATCH v3] " Uwe Kleine-König
@ 2021-04-23 5:33 ` Bruno Thomsen
2021-04-23 7:43 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Bruno Thomsen @ 2021-04-23 5:33 UTC (permalink / raw)
To: ptxdist
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.
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH v3] chrony: Fix location of config files
2021-04-23 5:33 ` Bruno Thomsen
@ 2021-04-23 7:43 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2021-04-23 7:43 UTC (permalink / raw)
To: ptxdist; +Cc: Uwe Kleine-König
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-23 7:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-19 16:01 [ptxdist] [PATCH] chrony: Fix location of config files Uwe Kleine-König
2021-04-19 16:07 ` Roland Hieber
2021-04-19 16:10 ` [ptxdist] [PATCH v2] " Uwe Kleine-König
2021-04-19 16:30 ` [ptxdist] [PATCH v3] " Uwe Kleine-König
2021-04-23 5:33 ` Bruno Thomsen
2021-04-23 7:43 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox