shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

unit: fix assert when trying to load unit instances for uninstanciable types

Browse Source 
http://lists.freedesktop.org/archives/systemd-devel/2011-April/001910.html
This commit is contained in:
Lennart Poettering 2011-04-28 01:26:39 +02:00
parent e190aa0be1
commit 796ba55494
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -2,8 +2,6 @@ F15:
* swap units that are activated by one name but shown in the kernel under another are semi-broken
* Fix assert http://lists.freedesktop.org/archives/systemd-devel/2011-April/001910.html
* 0595f9a1c182a84581749823ef47c5f292e545f9 is borked, freezes shutdown
(path: after installing inotify watches, recheck file again to fix race)
@ -38,8 +36,6 @@ Features:
* ensure we strip empty directories from search path
* maybe lower default timeout to 2min?
* GC unreferenced jobs (such as .device jobs)
* support wildcard expansion in ListenStream= and friends

4
src/unit.c
View File

@ -118,8 +118,10 @@ int unit_add_name(Unit *u, const char *text) {
if ((r = unit_name_to_instance(s, &i)) < 0)
goto fail;
if (i && unit_vtable[t]->no_instances)
if (i && unit_vtable[t]->no_instances) {
r = -EINVAL;
goto fail;
}
/* Ensure that this unit is either instanced or not instanced,
* but not both. */