Patchwork [meta-networking] ntp: allow to run pkg_postinst_ntpdate in do_rootfs

login
register
mail settings
Submitter Martin Jansa
Date Aug. 1, 2013, 7:09 a.m.
Message ID <1375340966-597-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/54889/
State Accepted
Commit 24a2c46d775b956ffdfc949834af6b43e67028c4
Headers show

Comments

Martin Jansa - Aug. 1, 2013, 7:09 a.m.
* read-only rootfs cannot run postinsts on first boot and in this case
  it doesn't really have to as we can create cron task in do_rootfs

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-networking/recipes-support/ntp/ntp.inc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
Joe MacDonald - Aug. 1, 2013, 12:51 p.m.
Herged.  Thanks.
-J.

[[oe] [meta-networking][PATCH] ntp: allow to run pkg_postinst_ntpdate in do_rootfs] On 13.08.01 (Thu 09:09) Martin Jansa wrote:

> * read-only rootfs cannot run postinsts on first boot and in this case
>   it doesn't really have to as we can create cron task in do_rootfs
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-networking/recipes-support/ntp/ntp.inc | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
> index 9367d41..6e8b452 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -114,14 +114,10 @@ INITSCRIPT_NAME = "ntpd"
>  INITSCRIPT_PARAMS = "defaults"
>  
>  pkg_postinst_ntpdate() {
> -if test "x$D" != "x"; then
> -    exit 1
> -else
> -    if ! grep -q -s ntpdate /var/spool/cron/root; then
> +    if ! grep -q -s ntpdate $D/var/spool/cron/root; then
>          echo "adding crontab"
> -        test -d /var/spool/cron || mkdir -p /var/spool/cron
> -        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> /var/spool/cron/root
> +        test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron
> +        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root
>      fi
> -fi
>  }
>

Patch

diff --git a/meta-networking/recipes-support/ntp/ntp.inc b/meta-networking/recipes-support/ntp/ntp.inc
index 9367d41..6e8b452 100644
--- a/meta-networking/recipes-support/ntp/ntp.inc
+++ b/meta-networking/recipes-support/ntp/ntp.inc
@@ -114,14 +114,10 @@  INITSCRIPT_NAME = "ntpd"
 INITSCRIPT_PARAMS = "defaults"
 
 pkg_postinst_ntpdate() {
-if test "x$D" != "x"; then
-    exit 1
-else
-    if ! grep -q -s ntpdate /var/spool/cron/root; then
+    if ! grep -q -s ntpdate $D/var/spool/cron/root; then
         echo "adding crontab"
-        test -d /var/spool/cron || mkdir -p /var/spool/cron
-        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> /var/spool/cron/root
+        test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron
+        echo "30 * * * *    ${bindir}/ntpdate-sync silent" >> $D/var/spool/cron/root
     fi
-fi
 }