chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 5ff621d1fae7f5fefdd590f894cb1c522e97ab51..45c8b4ea0f47de59bfcad41bb261fb243d1d9055 100644
(file)
--- a/
src/sysv-generator/sysv-generator.c
+++ b/
src/sysv-generator/sysv-generator.c
@@
-143,10
+143,8
@@
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"
fprintf(f,
"# Automatically generated by systemd-sysv-generator\n\n"
@@
-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);
@@
-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;
}