]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: convert uuid to string (#3146)
authorEvgeny Vereshchagin <evvers@ya.ru>
Fri, 29 Apr 2016 08:38:35 +0000 (11:38 +0300)
committerLennart Poettering <lennart@poettering.net>
Fri, 29 Apr 2016 08:38:35 +0000 (10:38 +0200)
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

src/nspawn/nspawn.c

index 8c90aa8015b883ac0ded47414e593b45bd53f2b0..3fc6cc955cf8277abb2f79d51e34146fc986fab9 100644 (file)
@@ -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;