Merge "de-fuzz ntp patches"

This commit is contained in:
Zuul 2018-09-27 19:55:13 +00:00 committed by Gerrit Code Review
commit a3c2dd7f13

View File

@ -1,14 +1,14 @@
From d66f217c9b90889aa7add35ed1562a4b50a7fd7a Mon Sep 17 00:00:00 2001
From a24ad7ed432352f238f51429e3c24c600c726a8a Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:29:00 -0400
Subject: [PATCH 1/3] WRS: ntp-spec-add-TiS-custom-config-files.patch
Subject: WRS: ntp-spec-add-TiS-custom-config-files.patch
---
SPECS/ntp.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec
index b9aaabd..f717899 100644
index 52ad9aa..73ab0f7 100644
--- a/SPECS/ntp.spec
+++ b/SPECS/ntp.spec
@@ -46,6 +46,7 @@ Source13: ntpdate.service
@ -19,7 +19,7 @@ index b9aaabd..f717899 100644
# ntpbz #802
Patch1: ntp-4.2.6p1-sleep.patch
@@ -444,6 +445,7 @@ sed -e 's|VENDORZONE\.|%{vendorzone}|' \
@@ -462,6 +463,7 @@ sed -e 's|VENDORZONE\.|%{vendorzone}|' \
touch -r %{SOURCE16} .%{_sysconfdir}/sysconfig/sntp
install -p -m600 %{SOURCE8} .%{_sysconfdir}/ntp/crypto/pw
install -p -m755 %{SOURCE10} .%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
@ -28,5 +28,5 @@ index b9aaabd..f717899 100644
install -p -m644 %{SOURCE13} .%{_unitdir}/ntpdate.service
install -p -m644 %{SOURCE14} .%{_unitdir}/ntp-wait.service
--
1.9.1
2.7.4