[systemd-commits] 2 commits - Makefile.am man/systemd.service.xml

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am             |    4 ++--
 man/systemd.service.xml |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 783162123dbac43d5b7a3fab9d4f11dcf86d06e1
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Mar 13 00:55:32 2013 -0400

    build-sys: use -f with ln -s
    
    Parallel builds would sometimes try to recreate the link,
    and fail since 'ln -s' would refuse to overwrite.

diff --git a/Makefile.am b/Makefile.am
index cfcca7c..b6d3306 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,7 @@ define move-to-rootlibdir
 		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+		$(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 	fi
 endef
@@ -3711,7 +3711,7 @@ man/%.html: man/%.xml man/custom-html.xsl
 	$(XSLTPROC_PROCESS_HTML)
 
 define html-alias
-	$(AM_V_LN)$(LN_S) $(notdir $<) $@
+	$(AM_V_LN)$(LN_S) -f $(notdir $<) $@
 endef
 
 endif

commit 3ae390ba020fd6c8bad9a6b384a6ff56c9fe5f5b
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date:   Wed Mar 13 12:43:40 2013 +0800

    man: Document the actual behaviour of ExecStopPost
    
    The documentation makes it sound like ExecStopPost is only run when
    stopping the service with `systemctl stop foo.service`
    
    However, that is not the case, as it also gets run when the service
    unexpectedly exists, crashes, or gets SIGKILLed.

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 8977873..b8b19b3 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -464,9 +464,12 @@
                                 <term><varname>ExecStopPost=</varname></term>
                                 <listitem><para>Additional commands
                                 that are executed after the service
-                                was stopped using the commands
-                                configured in
-                                <varname>ExecStop=</varname>. This
+                                was stopped. This includes cases where
+                                the commands configured in
+                                <varname>ExecStop=</varname> were used,
+                                where the service doesn't have any
+                                <varname>ExecStop=</varname> defined, or
+                                where the service exited unexpectedly. This
                                 argument takes multiple command lines,
                                 following the same scheme as described
                                 for <varname>ExecStart</varname>. Use