[systemd-devel] [PATCH] sysv-generator: Do not generate units for files handled by rc-local generator

Cristian Rodríguez crrodriguez at opensuse.org
Thu Jan 22 18:52:09 PST 2015


---
 src/sysv-generator/sysv-generator.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index b8b77aa..d6e4dfa 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -775,6 +775,14 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                         fpath = strjoin(*path, "/", de->d_name, NULL);
                         if (!fpath)
                                 return log_oom();
+#ifdef RC_LOCAL_SCRIPT_PATH_START
+                        if(streq(fpath, RC_LOCAL_SCRIPT_PATH_START))
+                            continue;
+#endif
+#ifdef RC_LOCAL_SCRIPT_PATH_STOP
+                        if(streq(fpath, RC_LOCAL_SCRIPT_PATH_STOP))
+                            continue;
+#endif
 
                         if (hashmap_contains(all_services, name))
                                 continue;
-- 
2.2.1



More information about the systemd-devel mailing list