diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 23:40:47 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 23:40:47 -0400 |
commit | 458554a48c62b7885a9347bb7103922f3b1f69e3 (patch) | |
tree | 5b05be7bdf7db5230592a0187cd2ef5f2263e20d /src/grp-machine | |
parent | be543a5265a5c2a812740574bdeeefd263958005 (diff) |
fix
Diffstat (limited to 'src/grp-machine')
-rw-r--r-- | src/grp-machine/libmachine-core/image-dbus.c | 14 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine-dbus.c | 32 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.c | 30 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machine.h | 2 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machined-dbus.c | 26 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/machined.h | 4 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/operation.c | 6 | ||||
-rw-r--r-- | src/grp-machine/libmachine-core/operation.h | 2 | ||||
-rw-r--r-- | src/grp-machine/machinectl/machinectl.c | 38 | ||||
-rw-r--r-- | src/grp-machine/nss-mymachines/nss-mymachines.c | 18 | ||||
-rw-r--r-- | src/grp-machine/systemd-machined/machined.c | 16 |
11 files changed, 94 insertions, 94 deletions
diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/libmachine-core/image-dbus.c index 0eed9b81bb..e55f419d46 100644 --- a/src/grp-machine/libmachine-core/image-dbus.c +++ b/src/grp-machine/libmachine-core/image-dbus.c @@ -17,16 +17,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "bus-label.h" +#include "basic/alloc-util.h" +#include "basic/bus-label.h" #include "bus-util.h" -#include "fd-util.h" +#include "basic/fd-util.h" #include "image-dbus.h" -#include "io-util.h" +#include "basic/io-util.h" #include "machine-image.h" -#include "process-util.h" -#include "strv.h" -#include "user-util.h" +#include "basic/process-util.h" +#include "basic/strv.h" +#include "basic/user-util.h" static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, image_type, ImageType); diff --git a/src/grp-machine/libmachine-core/machine-dbus.c b/src/grp-machine/libmachine-core/machine-dbus.c index 7b9aa66d63..dd6212249b 100644 --- a/src/grp-machine/libmachine-core/machine-dbus.c +++ b/src/grp-machine/libmachine-core/machine-dbus.c @@ -28,28 +28,28 @@ #include <libgen.h> #undef basename -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-common-errors.h" #include "bus-internal.h" -#include "bus-label.h" +#include "basic/bus-label.h" #include "bus-util.h" -#include "copy.h" -#include "env-util.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "fs-util.h" -#include "in-addr-util.h" +#include "basic/copy.h" +#include "basic/env-util.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/fs-util.h" +#include "basic/in-addr-util.h" #include "local-addresses.h" #include "machine-dbus.h" #include "machine.h" -#include "mkdir.h" -#include "path-util.h" -#include "process-util.h" -#include "signal-util.h" -#include "strv.h" -#include "terminal-util.h" -#include "user-util.h" +#include "basic/mkdir.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/signal-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" +#include "basic/user-util.h" static int property_get_id( sd_bus *bus, diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/libmachine-core/machine.c index 135f47dafc..3bcbe9782e 100644 --- a/src/grp-machine/libmachine-core/machine.c +++ b/src/grp-machine/libmachine-core/machine.c @@ -23,25 +23,25 @@ #include <systemd/sd-messages.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-error.h" #include "bus-util.h" -#include "escape.h" -#include "extract-word.h" -#include "fd-util.h" -#include "fileio.h" -#include "formats-util.h" -#include "hashmap.h" +#include "basic/escape.h" +#include "basic/extract-word.h" +#include "basic/fd-util.h" +#include "basic/fileio.h" +#include "basic/formats-util.h" +#include "basic/hashmap.h" #include "machine-dbus.h" #include "machine.h" -#include "mkdir.h" -#include "parse-util.h" -#include "process-util.h" -#include "special.h" -#include "string-table.h" -#include "terminal-util.h" -#include "unit-name.h" -#include "util.h" +#include "basic/mkdir.h" +#include "basic/parse-util.h" +#include "basic/process-util.h" +#include "basic/special.h" +#include "basic/string-table.h" +#include "basic/terminal-util.h" +#include "basic/unit-name.h" +#include "basic/util.h" Machine* machine_new(Manager *manager, MachineClass class, const char *name) { Machine *m; diff --git a/src/grp-machine/libmachine-core/machine.h b/src/grp-machine/libmachine-core/machine.h index e5d75361a9..c61b00b39f 100644 --- a/src/grp-machine/libmachine-core/machine.h +++ b/src/grp-machine/libmachine-core/machine.h @@ -22,7 +22,7 @@ typedef struct Machine Machine; typedef enum KillWho KillWho; -#include "list.h" +#include "basic/list.h" #include "machined.h" #include "operation.h" diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/libmachine-core/machined-dbus.c index 41f138882b..9346ad6a77 100644 --- a/src/grp-machine/libmachine-core/machined-dbus.c +++ b/src/grp-machine/libmachine-core/machined-dbus.c @@ -23,26 +23,26 @@ #include <systemd/sd-id128.h> -#include "alloc-util.h" -#include "btrfs-util.h" +#include "basic/alloc-util.h" +#include "basic/btrfs-util.h" #include "bus-common-errors.h" #include "bus-util.h" -#include "cgroup-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "hostname-util.h" +#include "basic/cgroup-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/hostname-util.h" #include "image-dbus.h" -#include "io-util.h" +#include "basic/io-util.h" #include "machine-dbus.h" #include "machine-image.h" #include "machine-pool.h" #include "machined.h" -#include "path-util.h" -#include "process-util.h" -#include "stdio-util.h" -#include "strv.h" -#include "unit-name.h" -#include "user-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" +#include "basic/stdio-util.h" +#include "basic/strv.h" +#include "basic/unit-name.h" +#include "basic/user-util.h" static int property_get_pool_path( sd_bus *bus, diff --git a/src/grp-machine/libmachine-core/machined.h b/src/grp-machine/libmachine-core/machined.h index 777571ebc0..b16ea3ef15 100644 --- a/src/grp-machine/libmachine-core/machined.h +++ b/src/grp-machine/libmachine-core/machined.h @@ -24,8 +24,8 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "hashmap.h" -#include "list.h" +#include "basic/hashmap.h" +#include "basic/list.h" typedef struct Manager Manager; diff --git a/src/grp-machine/libmachine-core/operation.c b/src/grp-machine/libmachine-core/operation.c index e6ddc41a55..69f6db2866 100644 --- a/src/grp-machine/libmachine-core/operation.c +++ b/src/grp-machine/libmachine-core/operation.c @@ -17,10 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "alloc-util.h" -#include "fd-util.h" +#include "basic/alloc-util.h" +#include "basic/fd-util.h" #include "operation.h" -#include "process-util.h" +#include "basic/process-util.h" static int operation_done(sd_event_source *s, const siginfo_t *si, void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; diff --git a/src/grp-machine/libmachine-core/operation.h b/src/grp-machine/libmachine-core/operation.h index 9397cd5f6d..0821466a00 100644 --- a/src/grp-machine/libmachine-core/operation.h +++ b/src/grp-machine/libmachine-core/operation.h @@ -24,7 +24,7 @@ #include <systemd/sd-bus.h> #include <systemd/sd-event.h> -#include "list.h" +#include "basic/list.h" typedef struct Operation Operation; diff --git a/src/grp-machine/machinectl/machinectl.c b/src/grp-machine/machinectl/machinectl.c index 92ffa8b83d..f57cbc1e77 100644 --- a/src/grp-machine/machinectl/machinectl.c +++ b/src/grp-machine/machinectl/machinectl.c @@ -31,34 +31,34 @@ #include <systemd/sd-bus.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-error.h" #include "bus-unit-util.h" #include "bus-util.h" #include "cgroup-show.h" -#include "cgroup-util.h" -#include "copy.h" -#include "env-util.h" -#include "fd-util.h" -#include "hostname-util.h" +#include "basic/cgroup-util.h" +#include "basic/copy.h" +#include "basic/env-util.h" +#include "basic/fd-util.h" +#include "basic/hostname-util.h" #include "import-util.h" -#include "log.h" +#include "basic/log.h" #include "logs-show.h" -#include "macro.h" -#include "mkdir.h" +#include "basic/macro.h" +#include "basic/mkdir.h" #include "pager.h" -#include "parse-util.h" -#include "path-util.h" -#include "process-util.h" +#include "basic/parse-util.h" +#include "basic/path-util.h" +#include "basic/process-util.h" #include "ptyfwd.h" -#include "signal-util.h" +#include "basic/signal-util.h" #include "spawn-polkit-agent.h" -#include "strv.h" -#include "terminal-util.h" -#include "unit-name.h" -#include "util.h" -#include "verbs.h" -#include "web-util.h" +#include "basic/strv.h" +#include "basic/terminal-util.h" +#include "basic/unit-name.h" +#include "basic/util.h" +#include "basic/verbs.h" +#include "basic/web-util.h" static char **arg_property = NULL; static bool arg_all = false; diff --git a/src/grp-machine/nss-mymachines/nss-mymachines.c b/src/grp-machine/nss-mymachines/nss-mymachines.c index da09035fe7..bf36fbfb02 100644 --- a/src/grp-machine/nss-mymachines/nss-mymachines.c +++ b/src/grp-machine/nss-mymachines/nss-mymachines.c @@ -23,16 +23,16 @@ #include <systemd/sd-bus.h> #include <systemd/sd-login.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-common-errors.h" -#include "hostname-util.h" -#include "in-addr-util.h" -#include "macro.h" -#include "nss-util.h" -#include "signal-util.h" -#include "string-util.h" -#include "user-util.h" -#include "util.h" +#include "basic/hostname-util.h" +#include "basic/in-addr-util.h" +#include "basic/macro.h" +#include "basic/nss-util.h" +#include "basic/signal-util.h" +#include "basic/string-util.h" +#include "basic/user-util.h" +#include "basic/util.h" NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); NSS_GETPW_PROTOTYPES(mymachines); diff --git a/src/grp-machine/systemd-machined/machined.c b/src/grp-machine/systemd-machined/machined.c index 151f0983ec..1c79c2a71b 100644 --- a/src/grp-machine/systemd-machined/machined.c +++ b/src/grp-machine/systemd-machined/machined.c @@ -23,18 +23,18 @@ #include <systemd/sd-daemon.h> -#include "alloc-util.h" +#include "basic/alloc-util.h" #include "bus-error.h" #include "bus-util.h" -#include "cgroup-util.h" -#include "dirent-util.h" -#include "fd-util.h" -#include "formats-util.h" -#include "hostname-util.h" -#include "label.h" +#include "basic/cgroup-util.h" +#include "basic/dirent-util.h" +#include "basic/fd-util.h" +#include "basic/formats-util.h" +#include "basic/hostname-util.h" +#include "basic/label.h" #include "machine-image.h" #include "machined.h" -#include "signal-util.h" +#include "basic/signal-util.h" Manager *manager_new(void) { Manager *m; |