From: Lennart Poettering Date: Wed, 30 May 2012 19:42:07 +0000 (+0200) Subject: service: mark compat options as such X-Git-Tag: v184~14 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c485d3ba094a0bf8d0165a4ba3eb5602cc21812a service: mark compat options as such This moves FsckPassNo= and SysVStartPriority= into its own "Compatibility Options" section in the man page to clarify that these options are not useful for anything but establishing a limited amount of compatibility. Also stop exposing these options on the bus. --- diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index a1cc9dbf8..d733f8153 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -258,6 +258,18 @@ + + + + + Compatibility Options + + The following option is also available in the + [Mount] section, but exists purely + for compatibility reasons and should not be used in + newly written mount files. + + FsckPassNo= @@ -268,7 +280,6 @@ for more information on this setting. - diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 11f98c34d..12d0b8a12 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -586,29 +586,6 @@ false. - - SysVStartPriority= - Set the SysV start - priority to use to order this service - in relation to SysV services lacking - LSB headers. This option is only - necessary to fix ordering in relation - to legacy SysV services, that have no - ordering information encoded in the - script headers. As such it should only - be used as temporary compatibility - option, and not be used in new unit - files. Almost always it is a better - choice to add explicit ordering - directives via - After= or - Before=, - instead. For more details see - systemd.unit5. If - used, pass an integer value in the - range 0-99. - - KillMode= Specifies how @@ -748,33 +725,6 @@ refers to. - - FsckPassNo= - Set the fsck passno - priority to use to order this service - in relation to other file system - checking services. This option is only - necessary to fix ordering in relation - to fsck jobs automatically created for - all /etc/fstab - entries with a value in the fs_passno - column > 0. As such it should only be - used as option for fsck - services. Almost always it is a better - choice to add explicit ordering - directives via - After= or - Before=, - instead. For more details see - systemd.unit5. If - used, pass an integer value in the - same range as - /etc/fstab's - fs_passno column. See - fstab5 - for details. - - StartLimitInterval= StartLimitBurst= @@ -838,6 +788,68 @@ + + Compatibility Options + + The following options are also available in the + [Service] section, but exist purely + for compatibility reasons and should not be used in + newly written service files. + + + + SysVStartPriority= + Set the SysV start + priority to use to order this service + in relation to SysV services lacking + LSB headers. This option is only + necessary to fix ordering in relation + to legacy SysV services, that have no + ordering information encoded in the + script headers. As such it should only + be used as temporary compatibility + option, and not be used in new unit + files. Almost always it is a better + choice to add explicit ordering + directives via + After= or + Before=, + instead. For more details see + systemd.unit5. If + used, pass an integer value in the + range 0-99. + + + + FsckPassNo= + Set the fsck passno + priority to use to order this service + in relation to other file system + checking services. This option is only + necessary to fix ordering in relation + to fsck jobs automatically created for + all /etc/fstab + entries with a value in the fs_passno + column > 0. As such it should only be + used as option for fsck + services. Almost always it is a better + choice to add explicit ordering + directives via + After= or + Before=, + instead. For more details see + systemd.unit5. If + used, pass an integer value in the + same range as + /etc/fstab's + fs_passno column. See + fstab5 + for details. + + + + + See Also diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 4c6d5f064..6568cd5ce 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -26,14 +26,6 @@ #include "dbus-service.h" #include "dbus-common.h" -#ifdef HAVE_SYSV_COMPAT -#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \ - " \n" \ - " \n" -#else -#define BUS_SERVICE_SYSV_INTERFACE_FRAGMENT "" -#endif - #define BUS_SERVICE_INTERFACE \ " \n" \ " \n" \ @@ -63,9 +55,7 @@ " \n" \ " \n" \ " \n" \ - " \n" \ " \n" \ - BUS_SERVICE_SYSV_INTERFACE_FRAGMENT \ " \n" #define INTROSPECTION \ @@ -144,11 +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) }, -#endif - { "FsckPassNo", bus_property_append_int, "i", offsetof(Service, fsck_passno) }, { "Result", bus_service_append_service_result,"s", offsetof(Service, result) }, { NULL, } };