Patchwork [meta-oe] meta-systemd: ntp: Fix ntpdate.service file to use right binary

login
register
mail settings
Submitter Otavio Salvador
Date Oct. 31, 2012, 12:01 p.m.
Message ID <1351684903-1276-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/38721/
State Superseded
Headers show

Comments

Otavio Salvador - Oct. 31, 2012, 12:01 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../recipes-support/ntp/ntp/ntpdate.service        |    2 +-
 .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Paul Eggleton - Oct. 31, 2012, 12:07 p.m.
On Wednesday 31 October 2012 10:01:43 Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  .../recipes-support/ntp/ntp/ntpdate.service        |    2 +-
>  .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
> b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
> index b2bc632..8df9970 100644
> --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
> +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
> @@ -4,7 +4,7 @@ Before=ntpd.service
> 
>  [Service]
>  Type=oneshot
> -ExecStart=/usr/bin/ntpd -q -g -x
> +ExecStart=/usr/bin/ntpdate pool.ntp.org

We *cannot* use pool.ntp.org for the reasons already discussed.

Cheers,
Paul
Otavio Salvador - Oct. 31, 2012, 12:10 p.m.
On Wed, Oct 31, 2012 at 10:07 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Wednesday 31 October 2012 10:01:43 Otavio Salvador wrote:
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>  .../recipes-support/ntp/ntp/ntpdate.service        |    2 +-
>>  .../recipes-support/ntp/ntp_4.2.6p5.bbappend       |    2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git
>> a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
>> b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
>> index b2bc632..8df9970 100644
>> --- a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
>> +++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
>> @@ -4,7 +4,7 @@ Before=ntpd.service
>>
>>  [Service]
>>  Type=oneshot
>> -ExecStart=/usr/bin/ntpd -q -g -x
>> +ExecStart=/usr/bin/ntpdate pool.ntp.org
>
> We *cannot* use pool.ntp.org for the reasons already discussed.

Do you have a pointer for this discussion?

Patch

diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
index b2bc632..8df9970 100644
--- a/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
+++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp/ntpdate.service
@@ -4,7 +4,7 @@  Before=ntpd.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/ntpd -q -g -x
+ExecStart=/usr/bin/ntpdate pool.ntp.org
 RemainAfterExit=yes
 
 [Install]
diff --git a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
index c6cd031..dbf3145 100644
--- a/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ b/meta-systemd/meta-networking/recipes-support/ntp/ntp_4.2.6p5.bbappend
@@ -1,6 +1,6 @@ 
 inherit systemd
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"