dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

core: do not touch instance from unit_choose_id()

Browse Source 
unit_choose_id() is about marking one of the aliases of the unit as the main
name. With the preparatory work in previous patches, all aliases of the unit
must have the same instance, so the operation to update the instance is a noop.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-05-27 16:36:38 +02:00
parent 934ef6a522
commit e2ea005681
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/unit.c
View File

@@ -317,7 +317,7 @@ int unit_add_name(Unit *u, const char *text) {
}
int unit_choose_id(Unit *u, const char *name) {
_cleanup_free_ char *t = NULL, *i = NULL;
_cleanup_free_ char *t = NULL;
char *s;
int r;
@@ -343,11 +343,6 @@ int unit_choose_id(Unit *u, const char *name) {
if (!s)
return -ENOENT;
/* Determine the new instance from the new id */
r = unit_name_to_instance(name, &i);
if (r < 0)
return r;
if (u->id) {
r = set_remove_and_put(u->aliases, name, u->id);
if (r < 0)
@@ -356,10 +351,6 @@ int unit_choose_id(Unit *u, const char *name) {
assert_se(set_remove(u->aliases, name)); /* see set_get() above… */
u->id = s; /* Old u->id is now stored in the set, and s is not stored anywhere */
free(u->instance);
u->instance = i;
unit_add_to_dbus_queue(u);
return 0;