mirror of https://gitee.com/openkylin/systemd.git
[PATCH] Revert "tests: add test case for UMask=+BindPaths= combination"
This test currently fails inside privileged LXD containers (LP: #1959013) This reverts commit ae53f4b5e48860b473c4d05958486a77f84ecc6d. Gbp-Pq: Name 0001-Revert-tests-add-test-case-for-UMask-BindPaths-combi.patch
This commit is contained in:
parent
980bb35a9b
commit
cfe94d168d
|
@ -1147,16 +1147,6 @@ static void test_exec_condition(Manager *m) {
|
||||||
test_service(m, "exec-condition-skip.service", SERVICE_SKIP_CONDITION);
|
test_service(m, "exec-condition-skip.service", SERVICE_SKIP_CONDITION);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_exec_umask_namespace(Manager *m) {
|
|
||||||
/* exec-specifier-credentials-dir.service creates /run/credentials and enables implicit
|
|
||||||
* InaccessiblePath= for the directory for all later services with mount namespace. */
|
|
||||||
if (!is_inaccessible_available()) {
|
|
||||||
log_notice("Testing without inaccessible, skipping %s", __func__);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
test(m, "exec-umask-namespace.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED);
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef struct test_entry {
|
typedef struct test_entry {
|
||||||
test_function_t f;
|
test_function_t f;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
@ -1239,7 +1229,6 @@ int main(int argc, char *argv[]) {
|
||||||
entry(test_exec_specifier),
|
entry(test_exec_specifier),
|
||||||
entry(test_exec_execsearchpath_specifier),
|
entry(test_exec_execsearchpath_specifier),
|
||||||
entry(test_exec_systemcallfilter_system),
|
entry(test_exec_systemcallfilter_system),
|
||||||
entry(test_exec_umask_namespace),
|
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
int r;
|
int r;
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
||||||
[Unit]
|
|
||||||
Description=Test for UMask= + namespacing
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/bin/ls -lahd /tmp/subdir
|
|
||||||
Type=oneshot
|
|
||||||
User=65534
|
|
||||||
Group=65534
|
|
||||||
TemporaryFileSystem=/tmp:ro
|
|
||||||
BindPaths=/etc:/tmp/subdir/subsub
|
|
||||||
UMask=0007
|
|
Loading…
Reference in New Issue