diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-28 17:26:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-28 17:26:59 -0400 |
| commit | 1ed649627c5dbf9254f325c8254bfa69c31466c9 (patch) | |
| tree | 33f436b38458a9e874cea6e89864fcea371c3fd7 /src/systemd-nspawn | |
| parent | b66477d644af37599d0981cae95f90ee99585202 (diff) | |
headerssss
Diffstat (limited to 'src/systemd-nspawn')
| -rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.c | 10 | ||||
| -rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.h | 2 | ||||
| -rw-r--r-- | src/systemd-nspawn/nspawn-network.c | 7 | ||||
| -rw-r--r-- | src/systemd-nspawn/nspawn-register.c | 7 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 4da7ef744f..a00e7600aa 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -17,18 +17,18 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <systemd/sd-netlink.h> - #include "basic/alloc-util.h" #include "basic/fd-util.h" -#include "firewall-util.h" #include "basic/in-addr-util.h" -#include "sd-netlink/local-addresses.h" -#include "nspawn-expose-ports.h" #include "basic/parse-util.h" #include "basic/socket-util.h" #include "basic/string-util.h" #include "basic/util.h" +#include "firewall-util.h" +#include "sd-netlink/local-addresses.h" +#include "sd-netlink/sd-netlink.h" + +#include "nspawn-expose-ports.h" int expose_port_parse(ExposePort **l, const char *s) { diff --git a/src/systemd-nspawn/nspawn-expose-ports.h b/src/systemd-nspawn/nspawn-expose-ports.h index 0003b74e62..2c0a5ecc88 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.h +++ b/src/systemd-nspawn/nspawn-expose-ports.h @@ -22,10 +22,10 @@ #include <inttypes.h> #include <systemd/sd-event.h> -#include <systemd/sd-netlink.h> #include "basic/in-addr-util.h" #include "basic/list.h" +#include "sd-netlink/sd-netlink.h" typedef struct ExposePort { int protocol; diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c index 98bb3e386f..4929615b74 100644 --- a/src/systemd-nspawn/nspawn-network.c +++ b/src/systemd-nspawn/nspawn-network.c @@ -22,18 +22,19 @@ #include "libudev.h" #include <systemd/sd-id128.h> -#include <systemd/sd-netlink.h> #include "basic/alloc-util.h" #include "basic/ether-addr-util.h" #include "basic/lockfile-util.h" -#include "nspawn-network.h" #include "basic/siphash24.h" #include "basic/socket-util.h" #include "basic/stat-util.h" #include "basic/string-util.h" -#include "shared/udev-util.h" #include "basic/util.h" +#include "sd-netlink/sd-netlink.h" +#include "shared/udev-util.h" + +#include "nspawn-network.h" #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1) #define CONTAINER_HASH_KEY SD_ID128_MAKE(c3,c4,f9,19,b5,57,b2,1c,e6,cf,14,27,03,9c,ee,a2) diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index 29e60ca48a..3f174b6f24 100644 --- a/src/systemd-nspawn/nspawn-register.c +++ b/src/systemd-nspawn/nspawn-register.c @@ -19,13 +19,14 @@ #include <systemd/sd-bus.h> +#include "basic/stat-util.h" +#include "basic/strv.h" +#include "basic/util.h" #include "sd-bus/bus-error.h" /* for bus_error_message */ #include "shared/bus-unit-util.h" #include "shared/bus-util.h" + #include "nspawn-register.h" -#include "basic/stat-util.h" -#include "basic/strv.h" -#include "basic/util.h" int register_machine( const char *machine_name, |