From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 10 Jan 2023 09:20:04 +0000 (+0900)
Subject: shutdown: propagate the original errno
X-Git-Tag: v253-rc1~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5afaf4071208e1b836e2c6693752e2fb3161d1c5;p=thirdparty%2Fsystemd.git

shutdown: propagate the original errno

Follow-up for b293bb23162534e0260ed07357c2478655541166.
---

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 13a80b8e7f0..dc662a5812f 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);