Attachment 461162 Details for Bug 728947

Do you have meant soemthing like that?

x (text/plain), 1.83 KB, created by Dr. Werner Fink on 2011-11-09 11:57:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dr. Werner Fink

Created: 2011-11-09 11:57:51 UTC

Size: 1.83 KB

patch

obsolete

>+@@ -36,6 +37,7 @@
>+ #include <stdlib.h>
>+ #include <fcntl.h>
>+ #include <sys/stat.h>
>++#include <sys/statfs.h>
>+ #include <sys/types.h>
>+ #include <sys/param.h>
>+ #include <sys/syscall.h>
>+@@ -44,6 +46,10 @@
>+ #include <errno.h>
>+ #include <limits.h>
>+ #include <getopt.h>
>++#include <linux/magic.h>
>++#if !defined(CGROUP_SUPER_MAGIC)
>++# define CGROUP_SUPER_MAGIC	0x27e0eb
>++#endif
>+ #if defined(USE_RPMLIB) && (USE_RPMLIB > 0)
>+ # include <rpm/rpmlib.h>
>+ # include <rpm/rpmmacro.h>
>+@@ -389,8 +395,8 @@ static void reversereq(service_t *restri
> [...] 
>@@ -239,7 +258,8 @@
> +    char *p;
> +    boolean ret = false;
> +
>-+    asprintf(&p, SYSTEMD_SERVICE_PATH "/%s.service", service);
>++    if (asprintf(&p, SYSTEMD_SERVICE_PATH "/%s.service", service) < 0)
>++	error("asprintf(): %s\n", strerror(errno));
> +
> +    if (access(p, F_OK) >= 0)
> +       ret = true;
>@@ -262,10 +282,20 @@
> +    if (is_overridden_by_systemd (name)) {
> +       char *p;
> +       int err = 0;
>++
> +       if (alternative_root && root)
>-+          asprintf (&p, "/bin/systemctl --root %s %s %s.service", root, verb, name);
>++	    err = asprintf (&p, "/bin/systemctl --no-reload --root %s %s %s.service", root, verb, name);
>++	else {
>++	    struct statfs stfs;
>++	    if (statfs("/sys/fs/cgroup/systemd", &stfs) < 0 && errno != ENOENT)
>++		error("statfs(): %s\n", strerror(errno));
>++	    if (errno == 0 && stfs.f_type == CGROUP_SUPER_MAGIC)
>++		err = asprintf (&p, "/bin/systemctl %s %s.service", verb, name);
> +       else
>-+          asprintf (&p, "/bin/systemctl %s %s.service", verb, name);
>++		err = asprintf (&p, "/bin/systemctl --no-reload %s %s.service", verb, name);
>++	}
>++	if (err < 0)
>++	    error("asprintf(): %s\n", strerror(errno));
> +
> +       warn("Note: sysvinit service %s is shadowed by systemd %s.service,\nForwarding request to '%s'.\n", initscript, name, p);
> +       if (!dryrun)

Actions: View

Attachments on bug 728947: 461162