diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/cgroup.c | 2 | ||||
| -rw-r--r-- | src/shutdown.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index f2d20c7db3..6357936d5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,14 +50,13 @@ AM_CPPFLAGS = \ -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \ -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \ -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \ - -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ + -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DRUNTIME_DIR=\"$(localstatedir)/run\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ - -DKEXEC_BINARY_PATH=\"/sbin/kexec\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ -I $(top_srcdir)/src @@ -82,6 +82,8 @@ * systemctl condrestart should return 0 if service isn't running +* fsck-root.service/start gets queued twice + External: * patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup. diff --git a/src/cgroup.c b/src/cgroup.c index 8b2ad5b0e9..5130d3a89f 100644 --- a/src/cgroup.c +++ b/src/cgroup.c @@ -255,7 +255,7 @@ int manager_setup_cgroup(Manager *m) { log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path); /* 3. Install agent */ - if ((r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, CGROUP_AGENT_PATH)) < 0) + if ((r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH)) < 0) log_warning("Failed to install release agent, ignoring: %s", strerror(-r)); else if (r > 0) log_debug("Installed release agent."); diff --git a/src/shutdown.c b/src/shutdown.c index 35426d2115..11c7544fc7 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -349,7 +349,7 @@ int main(int argc, char *argv[]) { log_warning("kexec failed. Falling back to normal reboot."); } else { /* Child */ - const char *args[5] = { KEXEC_BINARY_PATH, "-e", "-f", "-x", NULL }; + const char *args[5] = { "/sbin/kexec", "-e", "-f", "-x", NULL }; execv(args[0], (char * const *) args); return EXIT_FAILURE; } |