On Mon, Jul 05, 2021 at 09:49:24AM +0200, Uwe Kleine-König wrote: > The upstream default location of the config file is directly in /etc > instead of /etc/chrony/ and also the systemd unit uses /etc. So switch > the init script and ptxdist rules accordingly.
We have projectroot/etc/chrony/chrony.conf projectroot/etc/chrony/chrony.keys in PTXdist. Those should be moved, right? Michael > Signed-off-by: Uwe Kleine-König <[email protected]> > --- > projectroot/etc/init.d/chrony | 4 ++-- > rules/chrony.make | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony > index d112927f825e..1602eec6dcb9 100644 > --- a/projectroot/etc/init.d/chrony > +++ b/projectroot/etc/init.d/chrony > @@ -9,14 +9,14 @@ > > PATH=/sbin:/bin:/usr/bin:/usr/sbin > BINARY="/usr/sbin/chronyd" > -CONFIG="/etc/chrony/chrony.conf" > +CONFIG="/etc/chrony.conf" > PREFIX="chrony: " > # This system doesn?t have full rtc ioctl support for > # chrony statistic functions > RTC_IOCTL="incomplete" > > # some chronyc commands need prior autentication: extract keys from config > -KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' /etc/chrony/chrony.conf) > +KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' "$CONFIG") > PASSWORD=`awk '$1 ~ /^'$KEY'$/ {print $2; exit}' /etc/chrony/chrony.keys` > > # convenience functions > diff --git a/rules/chrony.make b/rules/chrony.make > index cbdf9314b52b..bdceb454c175 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 > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
