chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preset: enable machines.target by default
[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 432846990913748444004eea735dfec193784e12..6730843843ba4da0dd4c6c452812bae1360fff85 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);
@@
-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_unit_error
(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;
@@
-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')