diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-04 11:49:42 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-12 21:58:00 +0100 |
commit | 7a44c7e31fdeebce82189b134221297919104e7d (patch) | |
tree | 2b12fa18720523a3cace0a238ea78b719c1f7356 /src/sysv-generator | |
parent | aba311f7ffb1370156f48061a5fdc2da9551e57f (diff) | |
download | systemd-7a44c7e31fdeebce82189b134221297919104e7d.tar.gz |
generators: define custom main func definer and use it where applicable
There should be no functional difference, except that the error message
is changd from "three or no arguments" to "zero or three arguments". Somehow
the inverted form always seemed strange.
umask() call is also dropped from run-generator. I think it wasn't dropped in
053254e3cb215df3b8c905bc39b920f8817e1c7d because the run generator was merged
around the same time.
Diffstat (limited to 'src/sysv-generator')
-rw-r--r-- | src/sysv-generator/sysv-generator.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index c4acdc4a50..514b6e0169 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -42,7 +42,7 @@ static const struct { * means they are shut down anyway at system power off if running. */ }; -static const char *arg_dest = "/tmp"; +static const char *arg_dest = NULL; typedef struct SysvStub { char *name; @@ -917,22 +917,14 @@ finish: return r; } -static int run(int argc, char *argv[]) { +static int run(const char *dest, const char *dest_early, const char *dest_late) { _cleanup_(free_sysvstub_hashmapp) Hashmap *all_services = NULL; _cleanup_(lookup_paths_free) LookupPaths lp = {}; SysvStub *service; Iterator j; int r; - log_setup_generator(); - - if (argc > 1 && argc != 4) { - log_error("This program takes three or no arguments."); - return -EINVAL; - } - - if (argc > 1) - arg_dest = argv[3]; + assert_se(arg_dest = dest_late); r = lookup_paths_init(&lp, UNIT_FILE_SYSTEM, LOOKUP_PATHS_EXCLUDE_GENERATED, NULL); if (r < 0) @@ -961,4 +953,4 @@ static int run(int argc, char *argv[]) { return 0; } -DEFINE_MAIN_FUNCTION(run); +DEFINE_MAIN_GENERATOR_FUNCTION(run); |