From bc2708414babc5c99bb8000e63c84e87606cc15d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jan 2013 23:24:38 +0100 Subject: build-sys: drop all distribution specfic checks Yay, we now have a completely generic systemd. No distribution specific checks anymore! --- src/cgls/cgls.c | 1 - src/core/dbus-manager.c | 7 ++----- src/core/main.c | 5 ++--- src/delta/delta.c | 1 - src/detect-virt/detect-virt.c | 1 - src/hostname/hostnamectl.c | 1 - src/journal/cat.c | 1 - src/journal/coredumpctl.c | 1 - src/journal/journalctl.c | 1 - src/locale/localectl.c | 1 - src/login/inhibit.c | 1 - src/login/loginctl.c | 1 - src/machine-id-setup/machine-id-setup-main.c | 1 - src/notify/notify.c | 1 - src/systemctl/systemctl.c | 1 - src/timedate/timedatectl.c | 1 - src/tty-ask-password-agent/tty-ask-password-agent.c | 1 - 17 files changed, 4 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c index ad59c0127f..cfb728bb80 100644 --- a/src/cgls/cgls.c +++ b/src/cgls/cgls.c @@ -80,7 +80,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 262e5ffef4..859fa1a906 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -228,7 +228,6 @@ #define BUS_MANAGER_INTERFACE_PROPERTIES_GENERAL \ " \n" \ - " \n" \ " \n" \ " \n" \ " \n" \ @@ -526,13 +525,11 @@ static int bus_manager_set_runtime_watchdog_usec(DBusMessageIter *i, const char static const char systemd_property_string[] = PACKAGE_STRING "\0" - DISTRIBUTION "\0" SYSTEMD_FEATURES; static const BusProperty bus_systemd_properties[] = { - { "Version", bus_property_append_string, "s", 0 }, - { "Distribution", bus_property_append_string, "s", sizeof(PACKAGE_STRING) }, - { "Features", bus_property_append_string, "s", sizeof(PACKAGE_STRING) + sizeof(DISTRIBUTION) }, + { "Version", bus_property_append_string, "s", 0 }, + { "Features", bus_property_append_string, "s", sizeof(PACKAGE_STRING) }, { NULL, } }; diff --git a/src/core/main.c b/src/core/main.c index dfb53a8438..1ee3c9c0e8 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1064,7 +1064,6 @@ static int help(void) { static int version(void) { puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -1567,7 +1566,7 @@ int main(int argc, char *argv[]) { if (arg_running_as == SYSTEMD_SYSTEM) { const char *virtualization = NULL; - log_info(PACKAGE_STRING " running in system mode. (" SYSTEMD_FEATURES "; " DISTRIBUTION ")"); + log_info(PACKAGE_STRING " running in system mode. (" SYSTEMD_FEATURES ")"); detect_virtualization(&virtualization); if (virtualization) @@ -1577,7 +1576,7 @@ int main(int argc, char *argv[]) { log_info("Running in initial RAM disk."); } else - log_debug(PACKAGE_STRING " running in user mode. (" SYSTEMD_FEATURES "; " DISTRIBUTION ")"); + log_debug(PACKAGE_STRING " running in user mode. (" SYSTEMD_FEATURES ")"); if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) { locale_setup(); diff --git a/src/delta/delta.c b/src/delta/delta.c index a65cea51bc..9f20938516 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -362,7 +362,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c index bbb9dfc19a..bd3ee452c1 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/detect-virt/detect-virt.c @@ -80,7 +80,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c index e38be89b37..ff1f091776 100644 --- a/src/hostname/hostnamectl.c +++ b/src/hostname/hostnamectl.c @@ -406,7 +406,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/journal/cat.c b/src/journal/cat.c index 523a7a2eda..a95392ccb0 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -81,7 +81,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c index 4f0ed58397..b6e558186d 100644 --- a/src/journal/coredumpctl.c +++ b/src/journal/coredumpctl.c @@ -170,7 +170,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); arg_action = ACTION_NONE; return 0; diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 4d46beb3fe..a74d43be7f 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -202,7 +202,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 383a17dee1..5d35f9cdae 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -615,7 +615,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 4735df7d3b..9b6613340f 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -210,7 +210,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/login/loginctl.c b/src/login/loginctl.c index cfbc5fe02b..e2b33a626c 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -1394,7 +1394,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index 6373ebc2db..eb2d514855 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -67,7 +67,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/notify/notify.c b/src/notify/notify.c index ffc8dfeb9b..f521f56659 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -94,7 +94,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index b71d5de30a..2ebfff8daf 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4201,7 +4201,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c index 6a1c19a574..281c0524da 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -551,7 +551,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index 052c10e7d5..99a626c6c5 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -688,7 +688,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; -- cgit v1.2.3-54-g00ecf