chiark / gitweb /
sysv-generator: properly add Makefile symlink
[elogind.git] / src / sysv-generator / sysv-generator.c
index 434947e1ef54e7c0e2d2d94674be663a17eb9432..6730843843ba4da0dd4c6c452812bae1360fff85 100644 (file)
@@ -143,10 +143,8 @@ static int generate_unit_file(SysvStub *s) {
                 return log_oom();
 
         f = fopen(unit, "wxe");
-        if (!f) {
-                log_error_errno(errno, "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"
@@ -176,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);
 
@@ -709,7 +704,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                         _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);
@@ -782,7 +777,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                         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')