chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysv-generator: properly add Makefile symlink
[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 368d420df3bb450dd59645cb0e6f9a2cfa512231..6730843843ba4da0dd4c6c452812bae1360fff85 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"
@@
-114,9
+113,9
@@
static int add_symlink(const char *service, const char *where) {
}
static int generate_unit_file(SysvStub *s) {
}
static int generate_unit_file(SysvStub *s) {
- char *unit;
char **p;
_cleanup_fclose_ FILE *f = NULL;
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;
_cleanup_free_ char *before = NULL;
_cleanup_free_ char *after = NULL;
_cleanup_free_ char *wants = NULL;
@@
-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;
}
@@
-709,7
+704,7
@@
static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
_cleanup_free_ char *fpath = NULL, *name = NULL;
int r;
_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);
continue;
fpath = strjoin(*path, "/", de->d_name, NULL);
@@
-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;
}
@@
-782,7
+777,7
@@
static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
while ((de = readdir(d))) {
int a, b;
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')
continue;
if (de->d_name[0] != 'S' && de->d_name[0] != 'K')
@@
-810,9
+805,8
@@
static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
goto finish;
}
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;
}
log_warning("Could not find init script for %s", name);
continue;
}
@@
-824,8
+818,7
@@
static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
MAX(a*10 + b, service->sysv_start_priority);
}
MAX(a*10 + b, service->sysv_start_priority);
}
- r = set_ensure_allocated(&runlevel_services[i],
- trivial_hash_func, trivial_compare_func);
+ r = set_ensure_allocated(&runlevel_services[i], NULL);
if (r < 0)
goto finish;
if (r < 0)
goto finish;
@@
-836,8
+829,7
@@
static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
} else if (de->d_name[0] == 'K' &&
(rcnd_table[i].type == RUNLEVEL_DOWN)) {
} else if (de->d_name[0] == 'K' &&
(rcnd_table[i].type == RUNLEVEL_DOWN)) {
- r = set_ensure_allocated(&shutdown_services,
- trivial_hash_func, trivial_compare_func);
+ r = set_ensure_allocated(&shutdown_services, NULL);
if (r < 0)
goto finish;
if (r < 0)
goto finish;
@@
-905,7
+897,7
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- all_services = hashmap_new(
string_hash_func, string_compare_func
);
+ all_services = hashmap_new(
&string_hash_ops
);
if (!all_services) {
log_oom();
return EXIT_FAILURE;
if (!all_services) {
log_oom();
return EXIT_FAILURE;