From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 6 Feb 2019 18:07:34 +0000 (+0100)
Subject: sd-daemon: make sd_booted() return negative errno on unexpected error
X-Git-Tag: v241~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21042737f0686bc27dc620da53d11de072579924;p=thirdparty%2Fsystemd.git

sd-daemon: make sd_booted() return negative errno on unexpected error
---

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 218210f234b..9e8f0a73f57 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -604,7 +604,13 @@ _public_ int sd_booted(void) {
          * created. This takes place in mount-setup.c, so is
          * guaranteed to happen very early during boot. */
 
-        return laccess("/run/systemd/system/", F_OK) >= 0;
+        if (laccess("/run/systemd/system/", F_OK) >= 0)
+                return true;
+
+        if (errno == ENOENT)
+                return false;
+
+        return -errno;
 }
 
 _public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) {