diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-20 17:23:14 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-20 17:23:14 -0400 |
| commit | a7059224ad29d8e6c7542df3a9220e37e908c6c2 (patch) | |
| tree | a7161c2324958892641033e3787ceca773dbda06 | |
| parent | e85a3cc110b0ffc1cd346a4792b5afa614dd21dd (diff) | |
| parent | a779d627190fa46f5858275910e5e46deef11c6d (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
| -rw-r--r-- | src/grp-system/systemd/main.c | 2 | ||||
| -rw-r--r-- | src/systemd-machine-id-setup/machine-id-setup-main.c | 3 | ||||
| -rw-r--r-- | src/systemd-machine-id-setup/machine-id-setup.c (renamed from src/grp-system/libcore/src/machine-id-setup.c) | 3 | ||||
| -rw-r--r-- | src/systemd-machine-id-setup/machine-id-setup.h (renamed from src/grp-system/libcore/include/core/machine-id-setup.h) | 0 | ||||
| -rwxr-xr-x | tools/notsd-move | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c index be97cef6a1..ec79485d6c 100644 --- a/src/grp-system/systemd/main.c +++ b/src/grp-system/systemd/main.c @@ -45,9 +45,9 @@ #include "core/kmod-setup.h" #include "core/load-fragment.h" #include "core/loopback-setup.h" -#include "core/machine-id-setup.h" #include "core/manager.h" #include "core/mount-setup.h" +#include "machine-id-setup.h" #include "sd-bus/bus-error.h" #include "sd-bus/bus-util.h" #include "systemd-basic/alloc-util.h" diff --git a/src/systemd-machine-id-setup/machine-id-setup-main.c b/src/systemd-machine-id-setup/machine-id-setup-main.c index bde4d4faa6..deb0656d2f 100644 --- a/src/systemd-machine-id-setup/machine-id-setup-main.c +++ b/src/systemd-machine-id-setup/machine-id-setup-main.c @@ -22,11 +22,12 @@ #include <stdio.h> #include <stdlib.h> -#include "core/machine-id-setup.h" #include "systemd-basic/log.h" #include "systemd-basic/path-util.h" #include "systemd-basic/util.h" +#include "machine-id-setup.h" + static char *arg_root = NULL; static bool arg_commit = false; static bool arg_print = false; diff --git a/src/grp-system/libcore/src/machine-id-setup.c b/src/systemd-machine-id-setup/machine-id-setup.c index a8c6ae046c..f9b6b2d2ed 100644 --- a/src/grp-system/libcore/src/machine-id-setup.c +++ b/src/systemd-machine-id-setup/machine-id-setup.c @@ -24,7 +24,6 @@ #include <systemd/sd-id128.h> -#include "core/machine-id-setup.h" #include "sd-id128/id128-util.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" @@ -41,6 +40,8 @@ #include "systemd-basic/util.h" #include "systemd-basic/virt.h" +#include "machine-id-setup.h" + static int generate_machine_id(const char *root, sd_id128_t *ret) { const char *dbus_machine_id; _cleanup_close_ int fd = -1; diff --git a/src/grp-system/libcore/include/core/machine-id-setup.h b/src/systemd-machine-id-setup/machine-id-setup.h index 88830ecc42..88830ecc42 100644 --- a/src/grp-system/libcore/include/core/machine-id-setup.h +++ b/src/systemd-machine-id-setup/machine-id-setup.h diff --git a/tools/notsd-move b/tools/notsd-move index 4c4c916701..6e3ac40302 100755 --- a/tools/notsd-move +++ b/tools/notsd-move @@ -124,6 +124,8 @@ move_files() ( mv -t src/systemd-shutdown \ src/core/shutdown* \ src/core/umount* + mv -t src/systemd-machine-id-setup \ + src/core/machine-id-setup* mv -T src/{,lib}core mv -T src/{,libsystemd-}basic |