From 911f8f0183ef723737de3661b1dd042c7b2fcb6e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 7 Feb 2023 18:19:55 +0900 Subject: process-util: rename FORK_NULL_STDIO -> FORK_REARRANGE_STDIO And make safe_fork_full() takes fds to be assigned to stdio. --- src/shutdown/umount.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/shutdown') diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 61bd9d2601..bae4d9d023 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -618,7 +618,10 @@ static int remount_with_timeout(MountPoint *m, bool last_try) { /* Due to the possibility of a remount operation hanging, we fork a child process and set a * timeout. If the timeout lapses, the assumption is that the particular remount failed. */ - r = safe_fork_full("(sd-remount)", pfd, ELEMENTSOF(pfd), FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG|FORK_REOPEN_LOG, &pid); + r = safe_fork_full("(sd-remount)", + NULL, + pfd, ELEMENTSOF(pfd), + FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG|FORK_REOPEN_LOG, &pid); if (r < 0) return r; if (r == 0) { @@ -671,7 +674,10 @@ static int umount_with_timeout(MountPoint *m, bool last_try) { /* Due to the possibility of a umount operation hanging, we fork a child process and set a * timeout. If the timeout lapses, the assumption is that the particular umount failed. */ - r = safe_fork_full("(sd-umount)", pfd, ELEMENTSOF(pfd), FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG|FORK_REOPEN_LOG, &pid); + r = safe_fork_full("(sd-umount)", + NULL, + pfd, ELEMENTSOF(pfd), + FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_LOG|FORK_REOPEN_LOG, &pid); if (r < 0) return r; if (r == 0) { -- cgit v1.2.1