picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Fixes: #4676
This commit is contained in:
Lennart Poettering 2016-12-29 11:02:39 +01:00 committed by Martin Pitt
parent e0bc1d70d9
commit 8dbf71ec58
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nspawn/nspawn.c
View file

@ -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);