From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 29 Apr 2016 08:38:35 +0000 (+0300)
Subject: nspawn: convert uuid to string (#3146)
X-Git-Tag: v230~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e192a2815ef92ba8b2d6855be6cef0cbf3712272;p=thirdparty%2Fsystemd.git

nspawn: convert uuid to string (#3146)

Fixes:
cp /etc/machine-id /var/tmp/systemd-test.HccKPa/nspawn-root/etc
systemd-nspawn -D /var/tmp/systemd-test.HccKPa/nspawn-root --link-journal host -b
...
Host and machine ids are equal (P�S!V): refusing to link journals
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 8c90aa8015b..3fc6cc955cf 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1464,7 +1464,7 @@ static int setup_journal(const char *directory) {
 
         if (sd_id128_equal(arg_uuid, this_id)) {
                 log_full(try ? LOG_WARNING : LOG_ERR,
-                         "Host and machine ids are equal (%s): refusing to link journals", id);
+                         "Host and machine ids are equal (%s): refusing to link journals", sd_id128_to_string(arg_uuid, id));
                 if (try)
                         return 0;
                 return -EEXIST;