config: fix wait for backup completeness

diff --git a/src/config.c b/src/config.c
index 71e9ab0eee9e5ce8cc9a56ada2db7f07914d3912..10d20646ad203ec2996c825398312217d0d22a8f 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1243,6 +1243,7 @@ dobackup(const char *oldver)
       usleep(20000);
     if (code == -ECHILD)
       code = 0;
+    tvhinfo("config", "backup: completed");
   }
 
   if (code) {

diff --git a/src/spawn.c b/src/spawn.c
index 18ee0ba3acbed9917d468d631382afa57d5ad016..f311061932f15778156712090d39dc727db6522c 100644 (file)
--- a/src/spawn.c
+++ b/src/spawn.c
@@ -241,8 +241,11 @@ spawn_reap(pid_t wpid, char *stxt, size_t stxtlen)
     return -EAGAIN;
   if(pid < 0)
     return -errno;
-  if(pid < 1)
+  if(pid < 1) {
+    if (wpid > 0 && pid != wpid)
+      return -EAGAIN;
     return 0;
+  }
 
   pthread_mutex_lock(&spawn_mutex);
   LIST_FOREACH(s, &spawns, link)