[systemd-commits] 2 commits - configure.ac Makefile.am src/core src/login

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am               |    3 ++-
 configure.ac              |    2 ++
 src/core/shutdown.c       |    2 +-
 src/login/logind-action.c |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b31c6d8d4f33502d6060e708f5252ee2ea8648ad
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jul 15 23:13:12 2013 -0400

    build-sys: make generated man pages part of the distribution tarball
    
    They were removed by mistake, and since we ship .html files,
    we certainly should ship man pages.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=61753

diff --git a/Makefile.am b/Makefile.am
index 44cfd3e..0be3e79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -607,7 +607,7 @@ EXTRA_DIST += \
 	$(XML_FILES) \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
-	$(dist_MANS) \
+	$(man_MANS) \
 	make-man-index.py \
 	make-directive-index.py \
 	xml_helper.py

commit 7801356442578ff6e1c65844eb9e65c819af4660
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jul 15 23:04:52 2013 -0400

    build-sys: discover the path to kexec during build time
    
    https://bugs.freedesktop.org/show_bug.cgi?id=55248

diff --git a/Makefile.am b/Makefile.am
index 9105274..44cfd3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,6 +165,7 @@ AM_CPPFLAGS = \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 	-DQUOTACHECK=\"$(QUOTACHECK)\" \
+	-DKEXEC=\"$(KEXEC)\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/shared \
 	-I $(top_srcdir)/src/login \
diff --git a/configure.ac b/configure.ac
index 6f5fee5..94afe51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,8 @@ AC_PATH_PROG([KILL], [kill], [/usr/bin/kill])
 
 AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod])
 
+AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec])
+
 # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 m4_ifdef([GTK_DOC_CHECK], [
 GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 10a52bd..4709746 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -318,7 +318,7 @@ int main(int argc, char *argv[]) {
                                 log_warning("kexec failed. Falling back to normal reboot.");
                         } else {
                                 /* Child */
-                                const char *args[3] = { "/sbin/kexec", "-e", NULL };
+                                const char *args[3] = { KEXEC, "-e", NULL };
                                 execv(args[0], (char * const *) args);
                                 return EXIT_FAILURE;
                         }
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index c930591..74114ee 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -81,7 +81,7 @@ int manager_handle_action(
         else if (handle == HANDLE_HYBRID_SLEEP)
                 supported = can_sleep("hybrid-sleep") > 0;
         else if (handle == HANDLE_KEXEC)
-                supported = access("/sbin/kexec", X_OK) >= 0;
+                supported = access(KEXEC, X_OK) >= 0;
         else
                 supported = true;