diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/build.h | 51 | ||||
| -rw-r--r-- | src/main.c | 4 |
3 files changed, 56 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index abd07eb7ec..3d33e79325 100644 --- a/Makefile.am +++ b/Makefile.am @@ -337,7 +337,8 @@ EXTRA_DIST += \ src/dbus-common.h \ src/bus-errors.h \ src/cgroup-show.h \ - src/utmp-wtmp.h + src/utmp-wtmp.h \ + src/build.h MANPAGES = \ man/systemd.1 \ diff --git a/src/build.h b/src/build.h new file mode 100644 index 0000000000..d2058db051 --- /dev/null +++ b/src/build.h @@ -0,0 +1,51 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + +#ifndef foobuildhfoo +#define foobuildhfoo + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#ifdef HAVE_PAM +#define _PAM_FEATURE_ "+PAM" +#else +#define _PAM_FEATURE_ "-PAM" +#endif + +#ifdef HAVE_LIBWRAP +#define _LIBWRAP_FEATURE_ "+LIBWRAP" +#else +#define _LIBWRAP_FEATURE_ "-LIBWRAP" +#endif + +#ifdef HAVE_AUDIT +#define _AUDIT_FEATURE_ "+AUDIT" +#else +#define _AUDIT_FEATURE_ "-AUDIT" +#endif + +#ifdef HAVE_SELINUX +#define _SELINUX_FEATURE_ "+SELINUX" +#else +#define _SELINUX_FEATURE_ "-SELINUX" +#endif + +#define SYSTEMD_FEATURES _PAM_FEATURE_ " " _LIBWRAP_FEATURE_ " " _AUDIT_FEATURE_ " " _SELINUX_FEATURE_ + +#endif diff --git a/src/main.c b/src/main.c index 2e17f9b6fa..68da330b10 100644 --- a/src/main.c +++ b/src/main.c @@ -46,6 +46,7 @@ #include "bus-errors.h" #include "missing.h" #include "label.h" +#include "build.h" static enum { ACTION_RUN, @@ -988,7 +989,8 @@ int main(int argc, char *argv[]) { if (getpid() == 1) install_crash_handler(); - log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as)); + 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)); if (arg_running_as == MANAGER_SYSTEM) { |