summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-12-29 11:02:39 +0100
committerMartin Pitt <martin.pitt@ubuntu.com>2016-12-29 11:02:39 +0100
commit8dbf71ec58a6de42cbe5621384517364f9094534 (patch)
tree48645bbdf556495070fca05cb78f3f44f41faf54 /src/nspawn
parente0bc1d70d90ec75d27d287228c1c8821254d5a21 (diff)
nspawn: reword notice when /dev is pre-mounted and populated (#4971)
Fixes: #4676
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index faf1ecc5df..e366f642c7 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);