diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-09-06 03:11:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-06 03:11:24 +0200 |
| commit | 7d568925bda9797f611e36d1d00cd941701cb3c8 (patch) | |
| tree | cb7a5ed9ed72bd1ab4bcb19975dca9d6d46fac5c | |
| parent | 35df8f27fae82c6f9e83d750ffa5e54733b16cf2 (diff) | |
systemctl: make --version a little bit more verbose
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/systemctl.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 8d0da43630..ba9bbf8258 100644 --- a/configure.ac +++ b/configure.ac @@ -262,6 +262,7 @@ if test "z$with_distro" = "z"; then fi fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` +AC_DEFINE_UNQUOTED(DISTRIBUTION, ["${with_distro}"], [Target Distribution]) # Default generic names SPECIAL_SYSLOG_SERVICE=syslog.service diff --git a/src/main.c b/src/main.c index 2e6ccfaa30..d0587cb57b 100644 --- a/src/main.c +++ b/src/main.c @@ -992,7 +992,7 @@ int main(int argc, char *argv[]) { install_crash_handler(); log_full(arg_running_as == MANAGER_SYSTEM ? LOG_INFO : LOG_DEBUG, - PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES ")", manager_running_as_to_string(arg_running_as)); + PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES "; " DISTRIBUTION ")", manager_running_as_to_string(arg_running_as)); if (arg_running_as == MANAGER_SYSTEM && !serialization) { if (arg_show_status) diff --git a/src/systemctl.c b/src/systemctl.c index c77f831eaa..627b9055ae 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -52,6 +52,7 @@ #include "shutdownd.h" #include "exit-status.h" #include "bus-errors.h" +#include "build.h" static const char *arg_type = NULL; static char **arg_property = NULL; @@ -4031,6 +4032,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); + puts(DISTRIBUTION); + puts(SYSTEMD_FEATURES); return 0; case 't': |