shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 17:51:22 +03:00
Code

systemctl: permit "enable" and "add-wants" without any instances (#4992)

Browse Source 
This permits "systemctl enable" and "systemctl add-wants" on template
units without any specifications of an instance name, neither specified
on the command line, nor specified in DefaultInstance= field of the
[install] section.

Fixes: #3473
This commit is contained in:
Lennart Poettering 2016-12-29 11:14:49 +01:00 committed by Martin Pitt
parent 8dbf71ec58
commit be70491622
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/install.c
View File

@ -1567,18 +1567,12 @@ static int install_info_symlink_wants(
if (strv_isempty(list))
return 0;
if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE)) {
if (unit_name_is_valid(i->name, UNIT_NAME_TEMPLATE) && i->default_instance) {
UnitFileInstallInfo instance = {
.type = _UNIT_FILE_TYPE_INVALID,
};
_cleanup_free_ char *path = NULL;
/* Don't install any symlink if there's no default
* instance configured */
if (!i->default_instance)
return 0;
r = unit_name_replace_instance(i->name, i->default_instance, &buf);
if (r < 0)
return r;