shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

verify: use manager_load_startable_unit_or_warn() to load units for verification

Browse Source 
This doesn't change the outcome:
(before)
/home/zbyszek/src/systemd/test/test-execute/exec-basic.service:6: Executable path specifies a directory: /usr/bin/test/
exec-basic.service: Failed to create exec-basic.service/start: Unit exec-basic.service is not loaded properly: Exec format error.
(after)
/home/zbyszek/src/systemd/test/test-execute/exec-basic.service:6: Executable path specifies a directory: /usr/bin/test/
Failed to load file /home/zbyszek/src/systemd/test/test-execute/exec-basic.service: Exec format error

(before)
masked.service: Failed to create masked.service/start: Unit masked.service is masked.
(after)
File /home/zbyszek/src/systemd/test/test-execute/masked.service is masked.

but the failure is immediate and the error messages are more direct.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-04-12 15:58:45 +02:00
parent ba412430a9
commit f79cd1a9b2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/analyze/analyze-verify.c
View File

@ -244,7 +244,6 @@ static int verify_unit(Unit *u, bool check_man) {
} }
int verify_units(char **filenames, UnitFileScope scope, bool check_man, bool run_generators) { int verify_units(char **filenames, UnitFileScope scope, bool check_man, bool run_generators) {
_cleanup_(sd_bus_error_free) sd_bus_error err = SD_BUS_ERROR_NULL;
_cleanup_free_ char *var = NULL; _cleanup_free_ char *var = NULL;
Manager *m = NULL; Manager *m = NULL;
FILE *serial = NULL; FILE *serial = NULL;
@ -297,12 +296,10 @@ int verify_units(char **filenames, UnitFileScope scope, bool check_man, bool run
continue; continue;
} }
k = manager_load_unit(m, NULL, prepared, &err, &units[count]); k = manager_load_startable_unit_or_warn(m, NULL, prepared, &units[count]);
if (k < 0) { if (k < 0 && r == 0)
log_error_errno(k, "Failed to load %s: %m", *filename); r = k;
if (r == 0) else
r = k;
} else
count++; count++;
} }