shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

Merge pull request #7913 from sourcejedi/devpts

Browse Source 
3 nitpicks from core/namespace.c
This commit is contained in:
Alan Jenkins 2018-01-18 21:56:26 +00:00 committed by GitHub
commit 68f7480b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README
View File

@ -69,11 +69,10 @@ REQUIREMENTS:
create additional symlinks in /dev/disk/ and /dev/tape:
CONFIG_BLK_DEV_BSG
Required for PrivateNetwork= and PrivateDevices= in service units:
Required for PrivateNetwork= in service units:
CONFIG_NET_NS
CONFIG_DEVPTS_MULTIPLE_INSTANCES
Note that systemd-localed.service and other systemd units use
PrivateNetwork and PrivateDevices so this is effectively required.
PrivateNetwork so this is effectively required.
Required for PrivateUsers= in service units:
CONFIG_USER_NS
@ -119,6 +118,9 @@ REQUIREMENTS:
isn't. The next best thing is to make this change through a modprobe.d
drop-in. This is shipped by default, see modprobe.d/systemd.conf.
Required for systemd-nspawn:
CONFIG_DEVPTS_MULTIPLE_INSTANCES or Linux kernel >= 4.7
Note that kernel auditing is broken when used with systemd's
container code. When using systemd in conjunction with
containers, please make sure to either turn off auditing at

6
src/core/namespace.c
View File

@ -525,7 +525,7 @@ static int clone_device_node(const char *d, const char *temporary_mount) {
if (r < 0)
return log_debug_errno(errno, "mknod failed for %s: %m", d);
return 0;
return 1;
}
static int mount_private_dev(MountEntry *m) {
@ -582,12 +582,12 @@ static int mount_private_dev(MountEntry *m) {
}
} else {
r = clone_device_node("/dev/ptmx", temporary_mount);
if (r < 0)
if (r != 1)
goto fail;
}
devshm = strjoina(temporary_mount, "/dev/shm");
(void) mkdir(devshm, 01777);
(void) mkdir(devshm, 0755);
r = mount("/dev/shm", devshm, NULL, MS_BIND, NULL);
if (r < 0) {
r = -errno;