X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-service.c;h=6568cd5ce0ed97e1e1b5d2022767c581130d78e5;hb=e06c73cc91e02a1a3dffdb0976fef754f1109e74;hp=d84041541735dad4b6a6564fc2a58e2e5642a23c;hpb=b30e2f4c18ad81b04e4314fd191a5d458553773c;p=elogind.git
diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index d84041541..6568cd5ce 100644
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -6,16 +6,16 @@
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
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 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.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -26,15 +26,6 @@
#include "dbus-service.h"
#include "dbus-common.h"
-#ifdef HAVE_SYSV_COMPAT
-#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \
- " \n" \
- " \n" \
- " \n"
-#else
-#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT ""
-#endif
-
#define BUS_SERVICE_INTERFACE \
" \n" \
" \n" \
@@ -64,9 +55,7 @@
" \n" \
" \n" \
" \n" \
- " \n" \
" \n" \
- BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \
" \n"
#define INTROSPECTION \
@@ -145,12 +134,6 @@ static const BusProperty bus_service_properties[] = {
{ "ControlPID", bus_property_append_pid, "u", offsetof(Service, control_pid) },
{ "BusName", bus_property_append_string, "s", offsetof(Service, bus_name), true },
{ "StatusText", bus_property_append_string, "s", offsetof(Service, status_text), true },
-#ifdef HAVE_SYSV_COMPAT
- { "SysVRunLevels", bus_property_append_string, "s", offsetof(Service, sysv_runlevels), true },
- { "SysVStartPriority", bus_property_append_int, "i", offsetof(Service, sysv_start_priority) },
- { "SysVPath", bus_property_append_string, "s", offsetof(Service, sysv_path), true },
-#endif
- { "FsckPassNo", bus_property_append_int, "i", offsetof(Service, fsck_passno) },
{ "Result", bus_service_append_service_result,"s", offsetof(Service, result) },
{ NULL, }
};