diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-12 18:18:45 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-12 18:18:45 +0100 |
| commit | f1637bd3a81fe0468b53d7aa91b44cc0c34410d7 (patch) | |
| tree | 60306026034427f5016a1da67cdb9d4689e2a5e9 /src/core/unit.c | |
| parent | 05c450966a08ff85fa8348e2fe41b722612fa3dc (diff) | |
| parent | 79413b673b45adc98dfeaec882bbdda2343cb2f9 (diff) | |
Merge pull request #1515 from poettering/install-symlink
install: follow unit file symlinks in /usr, but not /etc when looking for [Install] data and more
Diffstat (limited to 'src/core/unit.c')
| -rw-r--r-- | src/core/unit.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index ccdc5191e8..a67b9f282f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3148,12 +3148,19 @@ int unit_following_set(Unit *u, Set **s) { } UnitFileState unit_get_unit_file_state(Unit *u) { + int r; + assert(u); - if (u->unit_file_state < 0 && u->fragment_path) - u->unit_file_state = unit_file_get_state( + if (u->unit_file_state < 0 && u->fragment_path) { + r = unit_file_get_state( u->manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, - NULL, basename(u->fragment_path)); + NULL, + basename(u->fragment_path), + &u->unit_file_state); + if (r < 0) + u->unit_file_state = UNIT_FILE_BAD; + } return u->unit_file_state; } @@ -3164,7 +3171,8 @@ int unit_get_unit_file_preset(Unit *u) { if (u->unit_file_preset < 0 && u->fragment_path) u->unit_file_preset = unit_file_query_preset( u->manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, - NULL, basename(u->fragment_path)); + NULL, + basename(u->fragment_path)); return u->unit_file_preset; } |