[systemd-commits] 2 commits - man/journalctl.xml src/nspawn

[Zbigniew Jędrzejewski-Szmek]

 man/journalctl.xml  |    4 ++--
 src/nspawn/nspawn.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 86d7de36869429f20d75e34bb3ddb2cfd2470e75
Author: Jan Janssen <medhefgo at web.de>
Date:   Fri Jul 19 13:54:51 2013 +0200

    man: Fix example to use the new --boot syntax

diff --git a/man/journalctl.xml b/man/journalctl.xml
index da43bf2..c8559a0 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -851,9 +851,9 @@
 
                 <programlisting>journalctl /dev/sda</programlisting>
 
-                <para>Show all kernel logs from last boot:</para>
+                <para>Show all kernel logs from previous boot:</para>
 
-                <programlisting>journalctl -k -b :</programlisting>
+                <programlisting>journalctl -k -b -1</programlisting>
 
         </refsect1>
 

commit aea38d8047a7a9370f8545007d242ede4a5cede1
Author: Jesper Larsen <jesper.larsen at ixonos.com>
Date:   Fri Jul 19 11:40:44 2013 +0200

    nspawn: Reorder includes to fix compilation
    
    Commit 2e996f4d4b642c5682c608c9692ad2ffae398ab2 added an include
    of linux/netlink.h
    
    This kernel header is not self contained in the linux 2.6 kernel
    which breaks compilation with an unknown type sa_family_t
    
    A workaround is to include linux/netlink.h after sys/socket.h

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index cfd88ef..fc005d9 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -39,9 +39,9 @@
 #include <sys/signalfd.h>
 #include <grp.h>
 #include <linux/fs.h>
-#include <linux/netlink.h>
 #include <sys/un.h>
 #include <sys/socket.h>
+#include <linux/netlink.h>
 
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-bus.h>