From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Jul 2021 09:49:48 +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 1m0JMS-0000wh-98 for lore@lore.pengutronix.de; Mon, 05 Jul 2021 09:49:48 +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 1m0JMR-0007Jb-Mq; Mon, 05 Jul 2021 09:49:47 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m0JMC-0007BA-LC; Mon, 05 Jul 2021 09:49:32 +0200 Received: from ukl by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1m0JMC-0006xG-Bt; Mon, 05 Jul 2021 09:49:32 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: ptxdist@pengutronix.de Date: Mon, 5 Jul 2021 09:49:24 +0200 Message-Id: <20210705074925.26542-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [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 Content-Type: multipart/mixed; boundary="===============0862383127==" 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 --===============0862383127== Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Uwe Kleine-König --- 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 --===============0862383127== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de --===============0862383127==--