Merge pull request #11244 from yuwata/revert-udev-changes

udev: revert bind/unbind patch and one more

diff --combined src/udev/udevd.c
index ed5c3eb5dd7caa655beecd5b90b7cbb7ec7cda44,ec77bd4a718de5396de77c01fc9078980d65766b..005ae0cd7fd82056b6347b4e418f8916f746d094
--- 1/src/udev/udevd.c
--- 2/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@@ -31,7 -31,6 +31,7 @@@
  #include "sd-event.h"
  
  #include "alloc-util.h"
 +#include "build.h"
  #include "cgroup-util.h"
  #include "cpu-set-util.h"
  #include "dev-setup.h"
@@@ -535,7 -534,7 +535,7 @@@ static int worker_spawn(Manager *manage
          if (r < 0)
                  return log_error_errno(r, "Worker: Failed to enable receiving of device: %m");
  
-         r = safe_fork("(worker)", FORK_DEATHSIG, &pid);
+         r = safe_fork(NULL, FORK_DEATHSIG, &pid);
          if (r < 0) {
                  event->state = EVENT_QUEUED;
                  return log_error_errno(r, "Failed to fork() worker: %m");
@@@ -1580,7 -1579,7 +1580,7 @@@ static int parse_argv(int argc, char *a
                  case 'h':
                          return help();
                  case 'V':
 -                        printf("%s\n", PACKAGE_VERSION);
 +                        printf("%s\n", GIT_VERSION);
                          return 0;
                  case '?':
                          return -EINVAL;
@@@ -1835,7 -1834,7 +1835,7 @@@ static int run(int argc, char *argv[]) 
          if (arg_daemonize) {
                  pid_t pid;
  
 -                log_info("starting version " PACKAGE_VERSION);
 +                log_info("starting version " GIT_VERSION);
  
                  /* connect /dev/null to stdin, stdout, stderr */
                  if (log_get_max_level() < LOG_DEBUG) {