summaryrefslogtreecommitdiff
path: root/test/test-execute
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-04-19 10:35:36 +0200
committerLennart Poettering <lennart@poettering.net>2018-04-19 11:41:28 +0200
commit63d6135feaf685b8d2822d18a829dcee1187ba4f (patch)
tree86c4f174e57f31f848bc25f0377494cccc3e5cfb /test/test-execute
parent8f63253149356e3aaa3545271e6f3654f7a6e5e7 (diff)
downloadsystemd-63d6135feaf685b8d2822d18a829dcee1187ba4f.tar.gz
tests: compare with correct shell
We synthesize the passwd record for UID 0, hence we need to compare with our synthesized data and not with the data stored in /etc/passwd
Diffstat (limited to 'test/test-execute')
-rw-r--r--test/test-execute/exec-specifier.service2
-rw-r--r--test/test-execute/exec-specifier@.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/test-execute/exec-specifier.service b/test/test-execute/exec-specifier.service
index 65a64bc95e..727d77f612 100644
--- a/test/test-execute/exec-specifier.service
+++ b/test/test-execute/exec-specifier.service
@@ -17,7 +17,7 @@ ExecStart=test %L = /var/log
ExecStart=sh -c 'test %u = $$(id -un 0)'
ExecStart=test %U = 0
ExecStart=sh -c 'test %h = $$(getent passwd 0 | cut -d: -f 6)'
-ExecStart=sh -c 'test %s = $$(getent passwd 0 | cut -d: -f 7)'
+ExecStart=sh -c 'test %s = /bin/sh'
ExecStart=sh -c 'test %m = $$(cat /etc/machine-id)'
ExecStart=sh -c 'test %b = $$(cat /proc/sys/kernel/random/boot_id | sed -e 's/-//g')'
ExecStart=sh -c 'test %H = $$(hostname)'
diff --git a/test/test-execute/exec-specifier@.service b/test/test-execute/exec-specifier@.service
index f8d7dce680..1b69e60843 100644
--- a/test/test-execute/exec-specifier@.service
+++ b/test/test-execute/exec-specifier@.service
@@ -17,7 +17,7 @@ ExecStart=test %L = /var/log
ExecStart=sh -c 'test %u = $$(id -un 0)'
ExecStart=test %U = 0
ExecStart=sh -c 'test %h = $$(getent passwd 0 | cut -d: -f 6)'
-ExecStart=sh -c 'test %s = $$(getent passwd 0 | cut -d: -f 7)'
+ExecStart=sh -c 'test %s = /bin/sh'
ExecStart=sh -c 'test %m = $$(cat /etc/machine-id)'
ExecStart=sh -c 'test %b = $$(cat /proc/sys/kernel/random/boot_id | sed -e 's/-//g')'
ExecStart=sh -c 'test %H = $$(hostname)'