core: warn and ignore SysVStartPriority=

[elogind.git] / src / sysv-generator / sysv-generator.c

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 6e4cdd694e5a877957d8e7bb980e531eea861ab0..45c8b4ea0f47de59bfcad41bb261fb243d1d9055 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -143,14 +143,13 @@ static int generate_unit_file(SysvStub *s) {
                 return log_oom();
 
         f = fopen(unit, "wxe");
-        if (!f) {
-                log_error("Failed to create unit file %s: %m", unit);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
 
         fprintf(f,
                 "# Automatically generated by systemd-sysv-generator\n\n"
                 "[Unit]\n"
+                "Documentation=man:systemd-sysv-generator(8)\n"
                 "SourcePath=%s\n"
                 "Description=%s\n",
                 s->path, s->description);
@@ -175,9 +174,6 @@ static int generate_unit_file(SysvStub *s) {
                 "RemainAfterExit=%s\n",
                 yes_no(!s->pid_file));
 
-        if (s->sysv_start_priority > 0)
-                fprintf(f, "SysVStartPriority=%d\n", s->sysv_start_priority);
-
         if (s->pid_file)
                 fprintf(f, "PIDFile=%s\n", s->pid_file);
 
@@ -192,7 +188,7 @@ static int generate_unit_file(SysvStub *s) {
         STRV_FOREACH(p, s->wanted_by) {
                 r = add_symlink(s->name, *p);
                 if (r < 0)
-                        log_error_unit(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r));
+                        log_unit_error_errno(s->name, r, "Failed to create 'Wants' symlink to %s: %m", *p);
         }
 
         return 0;
@@ -320,7 +316,7 @@ static int load_sysv(SysvStub *s) {
                         if (feof(f))
                                 break;
 
-                        log_error_unit(s->name,
+                        log_unit_error(s->name,
                                        "Failed to read configuration file '%s': %m",
                                        s->path);
                         return -errno;
@@ -395,7 +391,7 @@ static int load_sysv(SysvStub *s) {
 
                                 fn = strstrip(t+8);
                                 if (!path_is_absolute(fn)) {
-                                        log_error_unit(s->name,
+                                        log_unit_error(s->name,
                                                        "[%s:%u] PID file not absolute. Ignoring.",
                                                        s->path, line);
                                         continue;
@@ -489,12 +485,12 @@ static int load_sysv(SysvStub *s) {
                                         }
 
                                         if (r < 0)
-                                                log_error_unit(s->name,
+                                                log_unit_error(s->name,
                                                                "[%s:%u] Failed to add LSB Provides name %s, ignoring: %s",
                                                                s->path, line, m, strerror(-r));
                                 }
                                 if (!isempty(state_))
-                                        log_error_unit(s->name,
+                                        log_unit_error(s->name,
                                                        "[%s:%u] Trailing garbage in Provides, ignoring.",
                                                        s->path, line);
 
@@ -517,7 +513,7 @@ static int load_sysv(SysvStub *s) {
 
                                         r = sysv_translate_facility(n, basename(s->path), &m);
                                         if (r < 0) {
-                                                log_error_unit(s->name,
+                                                log_unit_error(s->name,
                                                                "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
                                                                s->path, line, n, strerror(-r));
                                                 continue;
@@ -551,12 +547,12 @@ static int load_sysv(SysvStub *s) {
                                         }
 
                                         if (r < 0)
-                                                log_error_unit(s->name,
+                                                log_unit_error(s->name,
                                                                "[%s:%u] Failed to add dependency on %s, ignoring: %s",
                                                                s->path, line, m, strerror(-r));
                                 }
                                 if (!isempty(state_))
-                                        log_error_unit(s->name,
+                                        log_unit_error(s->name,
                                                        "[%s:%u] Trailing garbage in %*s, ignoring.",
                                                        s->path, line,
                                                        (int)(strchr(t, ':') - t), t);
@@ -698,7 +694,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                 d = opendir(*path);
                 if (!d) {
                         if (errno != ENOENT)
-                                log_warning("opendir(%s) failed: %m", *path);
+                                log_warning_errno(errno, "opendir(%s) failed: %m", *path);
                         continue;
                 }
 
@@ -773,7 +769,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                         d = opendir(path);
                         if (!d) {
                                 if (errno != ENOENT)
-                                        log_warning("opendir(%s) failed: %m", path);
+                                        log_warning_errno(errno, "opendir(%s) failed: %m", path);
 
                                 continue;
                         }