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

[Michael Biebl]

2015-01-23 3:52 GMT+01:00 Cristian Rodríguez <crrodriguez at opensuse.org>:
> ---
>  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

If distros still ship such a rc.local sysv init script, shouldn't they
rather symlink that to
the native rc-local.service? Sounds like the better alternative to me.
Or alternatively, mask that service.

E.g in Debian we have /etc/init.d/rc.local and ship a
/lib/systemd/system/rc.local.service -> rc-local.service
symlink in the systemd package.

> +#ifdef RC_LOCAL_SCRIPT_PATH_STOP
> +                        if(streq(fpath, RC_LOCAL_SCRIPT_PATH_STOP))
> +                            continue;
> +#endif

Same here. Besides, isn't that stop script supposed to be /sbin/halt.local?
Debian doesn't have such a halt.local script, so I assume this is/was
some Red Hat / SuSE specific extension?

Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?