summaryrefslogtreecommitdiff
path: root/src/test/test-install-root.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-07-05 20:03:48 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-07-05 20:06:22 +0200
commit4276749dd3546dea6cc4a5967c698886829f4573 (patch)
tree453a73cdd552f666b65f2fce6ec94a82eff03676 /src/test/test-install-root.c
parent640f3b143d77b02612dc694a6a2be08f98d6c0e4 (diff)
downloadsystemd-4276749dd3546dea6cc4a5967c698886829f4573.tar.gz
shared/install: do not require /dev/null to be present in chroots
This partially undoes the parent commit. We follow the symlink and if it appears to be a symlink to /dev/null, even if /dev/null is not present, we treat it as such. The addition of creation of /dev/null in the test is reverted.
Diffstat (limited to 'src/test/test-install-root.c')
-rw-r--r--src/test/test-install-root.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c
index d437686bae..f309160889 100644
--- a/src/test/test-install-root.c
+++ b/src/test/test-install-root.c
@@ -1245,12 +1245,6 @@ int main(int argc, char *argv[]) {
p = strjoina(root, "/usr/lib/systemd/system-preset/");
assert_se(mkdir_p(p, 0755) >= 0);
- p = strjoina(root, "/dev/");
- assert_se(mkdir_p(p, 0755) >= 0);
-
- p = strjoina(root, "/dev/null");
- assert_se(touch(p) >= 0);
-
test_basic_mask_and_enable(root);
test_linked_units(root);
test_default(root);