From: Franck Bui <fbui@suse.com>
Date: Wed, 10 Jan 2018 22:28:44 +0000 (+0100)
Subject: tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty... 
X-Git-Tag: v237~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8dab75789ec1ffd53fc06f5f370220ae7b31d9d;p=thirdparty%2Fsystemd.git

tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849)
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index d69073535c1..96ffa420895 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -199,12 +199,12 @@ static const Specifier specifier_table[] = {
 static int specifier_machine_id_safe(char specifier, void *data, void *userdata, char **ret) {
         int r;
 
-        /* If /etc/machine_id is missing (e.g. in a chroot environment), returns
-         * a recognizable error so that the caller can skip the rule
+        /* If /etc/machine_id is missing or empty (e.g. in a chroot environment)
+         * return a recognizable error so that the caller can skip the rule
          * gracefully. */
 
         r = specifier_machine_id(specifier, data, userdata, ret);
-        if (r == -ENOENT)
+        if (IN_SET(r, -ENOENT, -ENOMEDIUM))
                 return -ENXIO;
 
         return r;