shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

tests: don't hardcode systemctl path

Browse Source 
Get it from type -P instead, to support --enable-split-usr.
This commit is contained in:
Martin Pitt 2015-02-02 00:19:30 +01:00 committed by Harald Hoyer
parent 3486cb6cfa
commit 53d90f9582
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1433,7 +1433,7 @@ EXTRA_DIST += \
test/c.service \
test/daughter.service \
test/d.service \
test/end.service \
test/end.service.in \
test/e.service \
test/f.service \
test/grandchild.service \

2
test/end.service → test/end.service.in
View File

@ -3,4 +3,4 @@ Description=End the test
After=testsuite.service
[Service]
ExecStart=/usr/bin/systemctl poweroff --no-block
ExecStart=@SYSTEMCTL@ poweroff --no-block

3
test/test-functions
View File

@ -293,7 +293,8 @@ install_terminfo() {
}
setup_testsuite() {
cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/
cp $TEST_BASE_DIR/testsuite.target $initdir/etc/systemd/system/
sed "s#@SYSTEMCTL@#$(type -P systemctl)#g" $TEST_BASE_DIR/end.service.in > $initdir/etc/systemd/system/end.service
mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service