diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-03-25 21:10:50 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-16 16:09:46 +0200 |
| commit | 42345b178da73c454e26645231dbd826e9a501f6 (patch) | |
| tree | fabdc5b24329b3e001cfdc944b8287db206e9c49 /test/test-execute/exec-specifier@.service | |
| parent | 5008da1ec1cf2cf8c15b702c4052e3a49583095d (diff) | |
| download | systemd-42345b178da73c454e26645231dbd826e9a501f6.tar.gz | |
test: drop the use of /bin/sh in various test services
This is not meant to be comprehensive, just the few cases where the /bin/sh -c wrapper
is obviously superfluous.
Diffstat (limited to 'test/test-execute/exec-specifier@.service')
| -rw-r--r-- | test/test-execute/exec-specifier@.service | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/test/test-execute/exec-specifier@.service b/test/test-execute/exec-specifier@.service index a90af5aee4..f8d7dce680 100644 --- a/test/test-execute/exec-specifier@.service +++ b/test/test-execute/exec-specifier@.service @@ -3,22 +3,22 @@ Description=Test for specifiers (template unit) [Service] Type=oneshot -ExecStart=/usr/bin/test %n = exec-specifier@foo-bar.service -ExecStart=/usr/bin/test %N = exec-specifier@foo-bar -ExecStart=/usr/bin/test %p = exec-specifier -ExecStart=/usr/bin/test %P = exec/specifier -ExecStart=/usr/bin/test %i = foo-bar -ExecStart=/usr/bin/test %I = foo/bar -ExecStart=/usr/bin/test %f = /foo/bar -ExecStart=/usr/bin/test %t = /run -ExecStart=/usr/bin/test %S = /var/lib -ExecStart=/usr/bin/test %C = /var/cache -ExecStart=/usr/bin/test %L = /var/log -ExecStart=/bin/sh -c 'test %u = $$(id -un 0)' -ExecStart=/usr/bin/test %U = 0 -ExecStart=/bin/sh -c 'test %h = $$(getent passwd 0 | cut -d: -f 6)' -ExecStart=/bin/sh -c 'test %s = $$(getent passwd 0 | cut -d: -f 7)' -ExecStart=/bin/sh -c 'test %m = $$(cat /etc/machine-id)' -ExecStart=/bin/sh -c 'test %b = $$(cat /proc/sys/kernel/random/boot_id | sed -e 's/-//g')' -ExecStart=/bin/sh -c 'test %H = $$(hostname)' -ExecStart=/bin/sh -c 'test %v = $$(uname -r)' +ExecStart=test %n = exec-specifier@foo-bar.service +ExecStart=test %N = exec-specifier@foo-bar +ExecStart=test %p = exec-specifier +ExecStart=test %P = exec/specifier +ExecStart=test %i = foo-bar +ExecStart=test %I = foo/bar +ExecStart=test %f = /foo/bar +ExecStart=test %t = /run +ExecStart=test %S = /var/lib +ExecStart=test %C = /var/cache +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 %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)' +ExecStart=sh -c 'test %v = $$(uname -r)' |