chiark / gitweb /
sysv: sysv service should depend on the full basic system, not only rc.sysinit
authorLennart Poettering <lennart@poettering.net>
Wed, 7 Apr 2010 01:20:19 +0000 (03:20 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 7 Apr 2010 01:20:19 +0000 (03:20 +0200)
manager.h
service.c

index 39be0dc..00d5ea1 100644 (file)
--- a/manager.h
+++ b/manager.h
@@ -82,7 +82,7 @@ struct Watch {
 #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
 #define SPECIAL_SYSLOG_TARGET "syslog.target"             /* Should pull in syslog.socket or syslog.service */
 #define SPECIAL_RTC_SET_TARGET "rtc-set.target"           /* LSB's $time */
-#define SPECIAL_SYSINIT_SERVICE "sysinit.service"
+#define SPECIAL_BASIC_SERVICE "basic.target"
 
 /* For SysV compatibility. Usually an alias for a saner target. On
  * SysV-free systems this doesn't exist. */
index fda553d..1ee0f05 100644 (file)
--- a/service.c
+++ b/service.c
@@ -565,8 +565,8 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n
         if ((r = sysv_exec_commands(s)) < 0)
                 goto finish;
 
-        if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_SYSINIT_SERVICE)) < 0 ||
-            (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_SYSINIT_SERVICE)) < 0)
+        if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_SERVICE)) < 0 ||
+            (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_SERVICE)) < 0)
                 goto finish;
 
         *new_state = UNIT_LOADED;