#include "path-util.h"
#include "path-lookup.h"
#include "log.h"
-#include "strv.h"
#include "unit.h"
#include "unit-name.h"
#include "special.h"
}
static int generate_unit_file(SysvStub *s) {
- char *unit;
char **p;
_cleanup_fclose_ FILE *f = NULL;
+ _cleanup_free_ char *unit = NULL;
_cleanup_free_ char *before = NULL;
_cleanup_free_ char *after = NULL;
_cleanup_free_ char *wants = NULL;
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);
"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);
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;
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;
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;
}
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);
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;
}
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);
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;
}
_cleanup_free_ char *fpath = NULL, *name = NULL;
int r;
- if (ignore_file(de->d_name))
+ if (hidden_file(de->d_name))
continue;
fpath = strjoin(*path, "/", de->d_name, NULL);
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;
}
while ((de = readdir(d))) {
int a, b;
- if (ignore_file(de->d_name))
+ if (hidden_file(de->d_name))
continue;
if (de->d_name[0] != 'S' && de->d_name[0] != 'K')
goto finish;
}
- if (hashmap_contains(all_services, name))
- service = hashmap_get(all_services, name);
- else {
+ service = hashmap_get(all_services, name);
+ if (!service){
log_warning("Could not find init script for %s", name);
continue;
}