Attachment 82673 Details for Bug 67075 – Patch

Patch

0001-nspawn-Reorder-includes-to-fix-compilation.patch (text/plain), 974 bytes, created by Jesper Larsen on 2013-07-19 09:46:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesper Larsen

Created: 2013-07-19 09:46:49 UTC

Size: 974 bytes

patch

obsolete

>From 6c2768e915015e5be7d497291df0a4c294468af0 Mon Sep 17 00:00:00 2001
>From: Jesper Larsen <jesper.larsen@ixonos.com>
>Date: Fri, 19 Jul 2013 11:40:44 +0200
>Subject: [PATCH] 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
>---
> src/nspawn/nspawn.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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>
>-- 
>1.7.10.4
>

Actions: View

Attachments on bug 67075: 82673

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.