diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-01-04 23:24:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-01-04 23:26:21 +0100 |
| commit | bc2708414babc5c99bb8000e63c84e87606cc15d (patch) | |
| tree | 37602916b5c4bc4fab0664864a86cd83c4c0469a /src/core | |
| parent | a382332eed10d3348231803c47a4c599d24c5e3a (diff) | |
build-sys: drop all distribution specfic checks
Yay, we now have a completely generic systemd. No distribution specific checks anymore!
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-manager.c | 7 | ||||
| -rw-r--r-- | src/core/main.c | 5 |
2 files changed, 4 insertions, 8 deletions
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 \ " <property name=\"Version\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"Distribution\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"Features\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"Tainted\" type=\"s\" access=\"read\"/>\n" \ " <property name=\"FirmwareTimestamp\" type=\"t\" access=\"read\"/>\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(); |