systemctl: make --version a little bit more verbose

diff --git a/configure.ac b/configure.ac
index 8d0da436300e759c90e066bd18c7e61118df4c2e..ba9bbf8258008f89c8df3fcb10af342a9bfa93e0 100644 (file)
--- 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:]]' `
         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
 
 # Default generic names
 SPECIAL_SYSLOG_SERVICE=syslog.service

diff --git a/src/main.c b/src/main.c
index 2e6ccfaa30d37f3e7a74234f4722cb296a150b66..d0587cb57b78722fcbd0cf9867764ee77177b1af 100644 (file)
--- 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,
                 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)
 
         if (arg_running_as == MANAGER_SYSTEM && !serialization) {
                 if (arg_show_status)

diff --git a/src/systemctl.c b/src/systemctl.c
index c77f831eaaafdf72b255d810517e64b30ab45e78..627b9055aeb9f71eb020568b83db2b0a04fd0d7d 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -52,6 +52,7 @@
 #include "shutdownd.h"
 #include "exit-status.h"
 #include "bus-errors.h"
 #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;
 
 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);
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);

+                        puts(DISTRIBUTION);
+                        puts(SYSTEMD_FEATURES);

                         return 0;
 
                 case 't':
                         return 0;
 
                 case 't':