From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Apr 2018 16:01:54 +0000 (+0200)
Subject: machine-image: use pretty names if we already have them and validated them
X-Git-Tag: v239~208^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=225219e5040a43291d07b30f501c11f85a19695b;p=thirdparty%2Fsystemd.git

machine-image: use pretty names if we already have them and validated them
---

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 853521e6d67..6fabe4cf7eb 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -412,7 +412,7 @@ int image_find(ImageClass class, const char *name, Image **ret) {
                         return -errno;
                 }
 
-                r = image_make(NULL, dirfd(d), path, name, ret);
+                r = image_make(name, dirfd(d), path, name, ret);
                 if (IN_SET(r, 0, -ENOENT)) {
                         _cleanup_free_ char *raw = NULL;
 
@@ -420,7 +420,7 @@ int image_find(ImageClass class, const char *name, Image **ret) {
                         if (!raw)
                                 return -ENOMEM;
 
-                        r = image_make(NULL, dirfd(d), path, raw, ret);
+                        r = image_make(name, dirfd(d), path, raw, ret);
                         if (IN_SET(r, 0, -ENOENT))
                                 continue;
                 }