Merge branch 'origin/master' (early part)

1 files changed, 2 insertions, 4 deletions

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 0a0802575..665f38fbd 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -409,9 +409,7 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
                 /* DAEMON_DEVNULL_STDIO is superfluous -
                  * it's always done by bb_daemonize() */
 #else
-                pid_t pid = vfork();
-                if (pid < 0) /* error */
-                        bb_perror_msg_and_die("vfork");
+                pid_t pid = xvfork();
                 if (pid != 0) {
                         /* parent */
                         /* why _exit? the child may have changed the stack,
@@ -448,5 +446,5 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
         execvp(startas, argv);
-        bb_perror_msg_and_die("can't start %s", startas);
+        bb_perror_msg_and_die("can't execute '%s'", startas);
 }