chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id-setup: casting const away is ugly, let's not do it if there's no reason to
[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 43bcaa862fb5c15df767bb7e67461f47754451a9..45c8b4ea0f47de59bfcad41bb261fb243d1d9055 100644
(file)
--- a/
src/sysv-generator/sysv-generator.c
+++ b/
src/sysv-generator/sysv-generator.c
@@
-31,7
+31,6
@@
#include "path-util.h"
#include "path-lookup.h"
#include "log.h"
#include "path-util.h"
#include "path-lookup.h"
#include "log.h"
-#include "strv.h"
#include "unit.h"
#include "unit-name.h"
#include "special.h"
#include "unit.h"
#include "unit-name.h"
#include "special.h"
@@
-144,14
+143,13
@@
static int generate_unit_file(SysvStub *s) {
return log_oom();
f = fopen(unit, "wxe");
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"
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);
"SourcePath=%s\n"
"Description=%s\n",
s->path, s->description);
@@
-176,9
+174,6
@@
static int generate_unit_file(SysvStub *s) {
"RemainAfterExit=%s\n",
yes_no(!s->pid_file));
"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);
if (s->pid_file)
fprintf(f, "PIDFile=%s\n", s->pid_file);
@@
-193,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)
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;
}
return 0;
@@
-321,7
+316,7
@@
static int load_sysv(SysvStub *s) {
if (feof(f))
break;
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;
"Failed to read configuration file '%s': %m",
s->path);
return -errno;
@@
-396,7
+391,7
@@
static int load_sysv(SysvStub *s) {
fn = strstrip(t+8);
if (!path_is_absolute(fn)) {
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;
"[%s:%u] PID file not absolute. Ignoring.",
s->path, line);
continue;
@@
-490,12
+485,12
@@
static int load_sysv(SysvStub *s) {
}
if (r < 0)
}
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_))
"[%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);
"[%s:%u] Trailing garbage in Provides, ignoring.",
s->path, line);
@@
-518,7
+513,7
@@
static int load_sysv(SysvStub *s) {
r = sysv_translate_facility(n, basename(s->path), &m);
if (r < 0) {
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;
"[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
s->path, line, n, strerror(-r));
continue;
@@
-552,12
+547,12
@@
static int load_sysv(SysvStub *s) {
}
if (r < 0)
}
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_))
"[%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);
"[%s:%u] Trailing garbage in %*s, ignoring.",
s->path, line,
(int)(strchr(t, ':') - t), t);
@@
-699,7
+694,7
@@
static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
d = opendir(*path);
if (!d) {
if (errno != ENOENT)
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;
}
continue;
}
@@
-774,7
+769,7
@@
static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
d = opendir(path);
if (!d) {
if (errno != ENOENT)
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;
}
continue;
}