]> git.ipfire.org Git - thirdparty/systemd.git/commit
systemctl: don't confuse sysv code with generated units
authorLennart Poettering <lennart@poettering.net>
Thu, 7 Apr 2016 16:48:01 +0000 (18:48 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 12 Apr 2016 11:43:32 +0000 (13:43 +0200)
commit4943d14306c3e456525fdb793e7f48efea5b9236
tree01ebe6e1d8ff0563f279d45e78c8ddfc0723a164
parenta69b4fb0f80689b96f492a557368ed880365edee
systemctl: don't confuse sysv code with generated units

The SysV compat code checks whether there's a native unit file before looking
for a SysV init script. Since the newest rework generated units will show up in
the unit path, and hence the checks ended up assuming that there always was a
native unit file for each init script: the generated one.

With this change the generated unit file directory is suppressed from the
search path when this check is done, to avoid the confusion.
src/core/manager.c
src/shared/install.c
src/shared/path-lookup.c
src/shared/path-lookup.h
src/systemctl/systemctl.c
src/sysv-generator/sysv-generator.c
src/test/test-path-lookup.c