[systemd-commits] 2 commits - man/systemd.swap.xml src/machine

[Zbigniew Jędrzejewski-Szmek]

 man/systemd.swap.xml     |    5 +----
 src/machine/machinectl.c |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit b50191c23f4cb6bac1180491b52e1df1e6c79a0f
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 13 20:05:42 2015 -0500

    man: remove "nofail" from systemd.swap(5)
    
    As suggested by Marcos Felipe Rasia de Mello <marcosfrm at gmail.com>.

diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 1155758..9cc3b80 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -139,15 +139,12 @@
 
                   <varlistentry>
                     <term><option>nofail</option></term>
-                    <term><option>fail</option></term>
 
                     <listitem><para>With <option>nofail</option> the
                     swap unit will be only wanted, not required by
                     <filename>swap.target</filename>. This means that
                     the boot will continue even if this swap device is
-                    not activated successfully. Option
-                    <option>fail</option> has the opposite meaning and
-                    is the default.</para>
+                    not activated successfully.</para>
                     </listitem>
                   </varlistentry>
                 </variablelist>

commit d538bfc71331d2e48363283decd77a61599021db
Author: Cristian Rodríguez <crrodriguez at opensuse.org>
Date:   Sun Jan 11 14:50:15 2015 -0300

    machinectl: use GNU basename, not the XPG version

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 749170e..980fba1 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -32,7 +32,7 @@
 #include <net/if.h>
 #include <sys/mount.h>
 #include <libgen.h>
-
+#undef basename
 #include "sd-bus.h"
 #include "log.h"
 #include "util.h"