From 5afaf4071208e1b836e2c6693752e2fb3161d1c5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 10 Jan 2023 18:20:04 +0900 Subject: [PATCH] shutdown: propagate the original errno Follow-up for b293bb23162534e0260ed07357c2478655541166. --- src/shutdown/umount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 13a80b8e7f..dc662a5812 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -638,7 +638,7 @@ static int remount_with_timeout(MountPoint *m, bool last_try) { if (read(pfd[0], &r, sizeof(r)) == sizeof(r)) log_debug_errno(r, "Remounting '%s' failed abnormally, child process " PID_FMT " failed: %m", m->path, pid); else - log_debug_errno(r, "Remounting '%s' failed abnormally, child process " PID_FMT " aborted or exited non-zero.", m->path, pid); + r = log_debug_errno(EPROTO, "Remounting '%s' failed abnormally, child process " PID_FMT " aborted or exited non-zero.", m->path, pid); TAKE_PID(pid); /* child exited (just not as we expected) hence don't kill anymore */ } else if (r < 0) log_error_errno(r, "Remounting '%s' failed unexpectedly, couldn't wait for child process " PID_FMT ": %m", m->path, pid);