Merge remote-tracking branch 'hannes/for-christophe'

Conflicts:
	multipathd/main.c

diff --cc multipathd/main.c
index cb77c82f21270553bc6d0246914564b80eeb29f1,24519606d0796dc6ba3d09e42eeb504308cc410c..378425d3d86fcd437d33ab2dd4b779b4ec945b90
--- 1/multipathd/main.c
--- 2/multipathd/main.c
+++ b/multipathd/main.c
@@@ -1567,13 -1704,17 +1700,13 @@@ daemonize(void
        }
  
        close(STDIN_FILENO);
 -      dup(in_fd);
 +      dup(dev_null_fd);
        close(STDOUT_FILENO);
 -      dup(out_fd);
 +      dup(dev_null_fd);
        close(STDERR_FILENO);
 -      dup(out_fd);
 -
 -      close(in_fd);
 -      close(out_fd);
 -      if (chdir("/") < 0)
 -              fprintf(stderr, "cannot chdir to '/', continuing\n");
 -
 +      dup(dev_null_fd);
- 
 +      close(dev_null_fd);
++      daemon_pid = getpid();
        return 0;
  }