From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 30 Jul 2019 15:55:37 +0000 (+0200)
Subject: Merge pull request #13119 from keszybz/unit-loading-2
X-Git-Tag: v243-rc1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5756bff6f17d3849e1c3e52e40edec3b5201fe68;p=thirdparty%2Fsystemd.git

Merge pull request #13119 from keszybz/unit-loading-2

Rework unit loading to take into account all aliases
---

5756bff6f17d3849e1c3e52e40edec3b5201fe68
diff --cc src/analyze/analyze.c
index e5c0cc853db,4ebce83b2ce..f62879371d0
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@@ -2216,8 -2211,8 +2263,9 @@@ static int help(int argc, char *argv[]
                 "  log-target [TARGET]      Get/set logging target for manager\n"
                 "  dump                     Output state serialization of service manager\n"
                 "  cat-config               Show configuration file and drop-ins\n"
+                "  unit-files               List files and symlinks for units\n"
                 "  unit-paths               List load directories for units\n"
 +               "  exit-status [STATUS...]  List exit status definitions\n"
                 "  syscall-filter [NAME...] Print list of syscalls in seccomp filter\n"
                 "  condition CONDITION...   Evaluate conditions and asserts\n"
                 "  verify FILE...           Check unit files for correctness\n"
@@@ -2419,10 -2413,11 +2467,12 @@@ static int run(int argc, char *argv[]) 
                  { "get-log-level",     VERB_ANY, 1,        0,            get_log_level          },
                  { "set-log-target",    2,        2,        0,            set_log_target         },
                  { "get-log-target",    VERB_ANY, 1,        0,            get_log_target         },
+ 
                  { "dump",              VERB_ANY, 1,        0,            dump                   },
                  { "cat-config",        2,        VERB_ANY, 0,            cat_config             },
+                 { "unit-files",        VERB_ANY, VERB_ANY, 0,            do_unit_files          },
                  { "unit-paths",        1,        1,        0,            dump_unit_paths        },
 +                { "exit-status",       VERB_ANY, VERB_ANY, 0,            dump_exit_status       },
                  { "syscall-filter",    VERB_ANY, VERB_ANY, 0,            dump_syscall_filters   },
                  { "condition",         2,        VERB_ANY, 0,            do_condition           },
                  { "verify",            2,        VERB_ANY, 0,            do_verify              },