X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fsysv-generator%2Fsysv-generator.c;h=45c8b4ea0f47de59bfcad41bb261fb243d1d9055;hb=0faacd470dfbd24f4c6504da6f04213aa05f9d19;hp=a2f853380cc49796a3ebeaee88aeff432c9e5b7a;hpb=79008bddf679a5e0900369950eb346c9fa687107;p=elogind.git diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index a2f853380..45c8b4ea0 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -143,14 +143,13 @@ static int generate_unit_file(SysvStub *s) { 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); @@ -175,9 +174,6 @@ static int generate_unit_file(SysvStub *s) { "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); @@ -192,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) - 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; @@ -698,7 +694,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { 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; } @@ -773,7 +769,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { 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; }