From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 29 Dec 2016 10:02:39 +0000 (+0100)
Subject: nspawn: reword notice when /dev is pre-mounted and populated (#4971)
X-Git-Tag: v233~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dbf71ec58a6de42cbe5621384517364f9094534;p=thirdparty%2Fsystemd.git

nspawn: reword notice when /dev is pre-mounted and populated (#4971)

Fixes: #4676
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index faf1ecc5df9..e366f642c7b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1425,12 +1425,9 @@ static int copy_devnodes(const char *dest) {
 
                 } else {
                         if (mknod(to, st.st_mode, st.st_rdev) < 0) {
-                                /*
-                                 * This is some sort of protection too against
-                                 * recursive userns chown on shared /dev/
-                                 */
+                                /* Explicitly warn the user when /dev is already populated. */
                                 if (errno == EEXIST)
-                                        log_notice("%s/dev/ should be an empty directory", dest);
+                                        log_notice("%s/dev is pre-mounted and pre-populated. If a pre-mounted /dev is provided it needs to be an unpopulated file system.", dest);
                                 if (errno != EPERM)
                                         return log_error_errno(errno, "mknod(%s) failed: %m", to);