Commit 6d12f6a1 authored by Rusty Russell's avatar Rusty Russell

daemonize / daemon_with_notify: ignore Ubuntu 13.10 brain death.

Apparently init --user adopts orphans.  To quote the author
Stewart Smith:

  As much as one can be happy in Ubuntu breaking something that has been
  true for what must be approaching 40 years, yep, I'm happy for you to
  make the changes.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent fe595287
...@@ -20,7 +20,7 @@ int main(int argc, char *argv[]) ...@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
struct child_data daemonized; struct child_data daemonized;
pid_t pid; pid_t pid;
plan_tests(6); plan_tests(5);
if (pipe(fds) != 0) if (pipe(fds) != 0)
err(1, "Failed pipe"); err(1, "Failed pipe");
...@@ -65,7 +65,9 @@ int main(int argc, char *argv[]) ...@@ -65,7 +65,9 @@ int main(int argc, char *argv[])
err(1, "Failed read"); err(1, "Failed read");
ok1(daemonized.pid != pid); ok1(daemonized.pid != pid);
#if 0 /* Believe it or not, this fails under Ubuntu 13.10 (Upstart) */
ok1(daemonized.ppid == 1); ok1(daemonized.ppid == 1);
#endif
ok1(daemonized.in_root_dir); ok1(daemonized.in_root_dir);
ok1(daemonized.read_from_stdin == 0); ok1(daemonized.read_from_stdin == 0);
ok1(daemonized.write_to_stdout == 0); ok1(daemonized.write_to_stdout == 0);
......
...@@ -20,7 +20,7 @@ int main(int argc, char *argv[]) ...@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
struct child_data daemonized; struct child_data daemonized;
pid_t pid; pid_t pid;
plan_tests(6); plan_tests(5);
if (pipe(fds) != 0) if (pipe(fds) != 0)
err(1, "Failed pipe"); err(1, "Failed pipe");
...@@ -64,7 +64,9 @@ int main(int argc, char *argv[]) ...@@ -64,7 +64,9 @@ int main(int argc, char *argv[])
err(1, "Failed read"); err(1, "Failed read");
ok1(daemonized.pid != pid); ok1(daemonized.pid != pid);
#if 0 /* Believe it or not, this fails under Ubuntu 13.10 (Upstart) */
ok1(daemonized.ppid == 1); ok1(daemonized.ppid == 1);
#endif
ok1(daemonized.in_root_dir); ok1(daemonized.in_root_dir);
ok1(daemonized.read_from_stdin == EBADF); ok1(daemonized.read_from_stdin == EBADF);
ok1(daemonized.write_to_stdout == EBADF); ok1(daemonized.write_to_stdout == EBADF);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment