aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorCorvin Köhne <CorvinK@beckhoff.com>2022-09-06 07:06:51 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2022-09-06 07:06:51 +0000
commit203f2c14c4b3c7a3e8f51a5a248201e1eb091886 (patch)
tree0b3a6600360a5d6fd809798a42ade0c90ed309b3 /sbin
parent95270f73baf6fa95ae529bc2eb6a61f5c79f32c0 (diff)
Diffstat (limited to 'sbin')
-rw-r--r--sbin/init/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 813387f63c81..cf48721faf8d 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1143,10 +1143,10 @@ run_script(const char *script)
do {
if ((wpid = waitpid(-1, &status, WUNTRACED)) != -1)
collect_child(wpid);
+ if (requested_transition == death_single ||
+ requested_transition == reroot)
+ return (state_func_t) requested_transition;
if (wpid == -1) {
- if (requested_transition == death_single ||
- requested_transition == reroot)
- return (state_func_t) requested_transition;
if (errno == EINTR)
continue;
warning("wait for %s on %s failed: %m; going to "