diff options
| author | Yu Watanabe <yuwata@yukawa.kyoto-u.ac.jp> | 2020-12-15 12:07:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 12:07:30 +0900 |
| commit | fc874bf3bf3e5403b9b60fd23281d9623b864466 (patch) | |
| tree | a424bbf7372469f6a77255727429ea922c3c78b7 | |
| parent | 361f41645cdf920d431e2d68dcfa3f98088c2e03 (diff) | |
| parent | c4837f45674736f692bea29348d217ee8908fc5b (diff) | |
| download | systemd-fc874bf3bf3e5403b9b60fd23281d9623b864466.tar.gz | |
Merge pull request #17977 from yuwata/namespace-mount-procfs-follow-up
core/namespace: do not ignore non-EPERM mount error
| -rw-r--r-- | src/core/namespace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c index 93eab45e21..9154fde77e 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -914,7 +914,8 @@ static int mount_procfs(const MountEntry *m, const NamespaceInfo *ns_info) { if (r == 0) /* /proc is not mounted. Propagate the original error code. */ return -EPERM; - } + } else if (r < 0) + return r; return 1; } @@ -1691,12 +1692,10 @@ int setup_namespace( *(m++) = (MountEntry) { .path_const = "/proc/sys/kernel/hostname", .mode = READONLY, - .ignore = true, }; *(m++) = (MountEntry) { .path_const = "/proc/sys/kernel/domainname", .mode = READONLY, - .ignore = true, }; } |