From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 07 Jul 2021 16:15:28 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18Km-0001pN-1L for lore@lore.pengutronix.de; Wed, 07 Jul 2021 16:15:28 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18Kl-0005HG-Kt; Wed, 07 Jul 2021 16:15:27 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m18KZ-0005GX-0g; Wed, 07 Jul 2021 16:15:15 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1m18KY-0002YW-FP; Wed, 07 Jul 2021 16:15:14 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1m18KY-001XLo-Ed; Wed, 07 Jul 2021 16:15:14 +0200 Date: Wed, 7 Jul 2021 16:15:14 +0200 From: Michael Olbrich To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Message-ID: <20210707141514.GF4015839@pengutronix.de> Mail-Followup-To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , ptxdist@pengutronix.de References: <20210705074925.26542-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210705074925.26542-1-u.kleine-koenig@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH 1/2] chrony: unify location of config files X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Mon, Jul 05, 2021 at 09:49:24AM +0200, Uwe Kleine-K=F6nig 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=F6nig > --- > 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=3D/sbin:/bin:/usr/bin:/usr/sbin > BINARY=3D"/usr/sbin/chronyd" > -CONFIG=3D"/etc/chrony/chrony.conf" > +CONFIG=3D"/etc/chrony.conf" > PREFIX=3D"chrony: " > # This system doesn?t have full rtc ioctl support for > # chrony statistic functions > RTC_IOCTL=3D"incomplete" > = > # some chronyc commands need prior autentication: extract keys from conf= ig > -KEY=3D$(awk '$1 ~ /^commandkey$/ { print $2; exit}' /etc/chrony/chrony.c= onf) > +KEY=3D$(awk '$1 ~ /^commandkey$/ { print $2; exit}' "$CONFIG") > PASSWORD=3D`awk '$1 ~ /^'$KEY'$/ {print $2; exit}' /etc/chrony/chrony.ke= ys` > = > # 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.con= f) > - @$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony/chrony.key= s) > + @$(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 -- = 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 ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@p= engutronix.de