614 lines
27 KiB
Diff
614 lines
27 KiB
Diff
From 3c91ed36496fa7cab722cdc3646781c873242034 Mon Sep 17 00:00:00 2001
|
|
From: overweight <hexiaowen@huawei.com>
|
|
Date: Wed, 5 Jul 2023 10:53:20 +0800
|
|
Subject: [PATCH] build: To adjust the directory structure
|
|
|
|
---
|
|
Cargo.toml | 12 ++++++++----
|
|
core/{lib => libsysmaster}/error.rs | 0
|
|
core/{lib => libsysmaster}/exec/base.rs | 0
|
|
core/{lib => libsysmaster}/exec/cmd.rs | 0
|
|
core/{lib => libsysmaster}/exec/mod.rs | 0
|
|
core/{lib => libsysmaster}/lib.rs | 0
|
|
core/{lib => libsysmaster}/rel/api.rs | 0
|
|
core/{lib => libsysmaster}/rel/base.rs | 0
|
|
core/{lib => libsysmaster}/rel/enable.rs | 0
|
|
core/{lib => libsysmaster}/rel/history.rs | 0
|
|
core/{lib => libsysmaster}/rel/last.rs | 0
|
|
core/{lib => libsysmaster}/rel/mod.rs | 0
|
|
core/{lib => libsysmaster}/rel/pending.rs | 0
|
|
core/{lib => libsysmaster}/rel/station.rs | 0
|
|
core/{lib => libsysmaster}/serialize.rs | 0
|
|
core/{lib => libsysmaster}/unit/base.rs | 0
|
|
core/{lib => libsysmaster}/unit/deps.rs | 0
|
|
core/{lib => libsysmaster}/unit/kill.rs | 0
|
|
core/{lib => libsysmaster}/unit/mod.rs | 0
|
|
core/{lib => libsysmaster}/unit/state.rs | 0
|
|
core/{lib => libsysmaster}/unit/umif.rs | 0
|
|
core/{lib => libsysmaster}/utils/fd.rs | 0
|
|
core/{lib => libsysmaster}/utils/mod.rs | 0
|
|
{exts/sctl/src => core/sctl}/main.rs | 0
|
|
core/{bin => sysmaster}/job/alloc.rs | 0
|
|
core/{bin => sysmaster}/job/entry.rs | 0
|
|
core/{bin => sysmaster}/job/junit.rs | 0
|
|
core/{bin => sysmaster}/job/manager.rs | 0
|
|
core/{bin => sysmaster}/job/mod.rs | 0
|
|
core/{bin => sysmaster}/job/notify.rs | 0
|
|
core/{bin => sysmaster}/job/rentry.rs | 0
|
|
core/{bin => sysmaster}/job/stat.rs | 0
|
|
core/{bin => sysmaster}/job/table.rs | 0
|
|
core/{bin => sysmaster}/job/transaction.rs | 0
|
|
core/{bin => sysmaster}/keep_alive/mod.rs | 0
|
|
core/{bin => sysmaster}/main.rs | 0
|
|
core/{bin => sysmaster}/manager/alive_timer.rs | 0
|
|
core/{bin => sysmaster}/manager/commands.rs | 0
|
|
core/{bin => sysmaster}/manager/config.rs | 0
|
|
core/{bin => sysmaster}/manager/mod.rs | 0
|
|
core/{bin => sysmaster}/manager/pre_install.rs | 0
|
|
core/{bin => sysmaster}/manager/rentry.rs | 0
|
|
core/{bin => sysmaster}/manager/signals.rs | 0
|
|
core/{bin => sysmaster}/mount/mod.rs | 0
|
|
core/{bin => sysmaster}/mount/setup.rs | 0
|
|
core/{bin => sysmaster}/plugin/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/base/load.rs | 0
|
|
core/{bin => sysmaster}/unit/base/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/base/relation.rs | 0
|
|
core/{bin => sysmaster}/unit/base/relation_atom.rs | 0
|
|
core/{bin => sysmaster}/unit/data/dep_conf.rs | 0
|
|
core/{bin => sysmaster}/unit/data/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/data/state.rs | 0
|
|
core/{bin => sysmaster}/unit/data/table.rs | 0
|
|
core/{bin => sysmaster}/unit/datastore/child.rs | 0
|
|
core/{bin => sysmaster}/unit/datastore/deps.rs | 0
|
|
core/{bin => sysmaster}/unit/datastore/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/datastore/sets.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/base.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/cgroup.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/child.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/condition.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/config.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/load.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/ratelimit.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/uentry.rs | 0
|
|
core/{bin => sysmaster}/unit/entry/unitx.rs | 0
|
|
core/{bin => sysmaster}/unit/execute/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/execute/spawn.rs | 0
|
|
core/{bin => sysmaster}/unit/manager.rs | 0
|
|
core/{bin => sysmaster}/unit/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/notify.rs | 0
|
|
core/{bin => sysmaster}/unit/rentry.rs | 0
|
|
core/{bin => sysmaster}/unit/runtime.rs | 0
|
|
core/{bin => sysmaster}/unit/sigchld.rs | 0
|
|
core/{bin => sysmaster}/unit/test/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/uload.rs | 0
|
|
core/{bin => sysmaster}/unit/util/mod.rs | 0
|
|
core/{bin => sysmaster}/unit/util/unit_file.rs | 0
|
|
core/{bin => sysmaster}/utils/mod.rs | 0
|
|
core/{bin => sysmaster}/utils/table.rs | 0
|
|
exts/sctl/Cargo.toml | 13 -------------
|
|
{exts/init => init}/Cargo.toml | 2 +-
|
|
{exts/init => init}/src/main.rs | 0
|
|
{exts/init => init}/src/runtime/comm.rs | 0
|
|
{exts/init => init}/src/runtime/epoll.rs | 0
|
|
{exts/init => init}/src/runtime/mod.rs | 0
|
|
{exts/init => init}/src/runtime/param.rs | 0
|
|
{exts/init => init}/src/runtime/signals.rs | 0
|
|
{exts/init => init}/src/runtime/timer.rs | 0
|
|
91 files changed, 9 insertions(+), 18 deletions(-)
|
|
rename core/{lib => libsysmaster}/error.rs (100%)
|
|
rename core/{lib => libsysmaster}/exec/base.rs (100%)
|
|
rename core/{lib => libsysmaster}/exec/cmd.rs (100%)
|
|
rename core/{lib => libsysmaster}/exec/mod.rs (100%)
|
|
rename core/{lib => libsysmaster}/lib.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/api.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/base.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/enable.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/history.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/last.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/mod.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/pending.rs (100%)
|
|
rename core/{lib => libsysmaster}/rel/station.rs (100%)
|
|
rename core/{lib => libsysmaster}/serialize.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/base.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/deps.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/kill.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/mod.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/state.rs (100%)
|
|
rename core/{lib => libsysmaster}/unit/umif.rs (100%)
|
|
rename core/{lib => libsysmaster}/utils/fd.rs (100%)
|
|
rename core/{lib => libsysmaster}/utils/mod.rs (100%)
|
|
rename {exts/sctl/src => core/sctl}/main.rs (100%)
|
|
rename core/{bin => sysmaster}/job/alloc.rs (100%)
|
|
rename core/{bin => sysmaster}/job/entry.rs (100%)
|
|
rename core/{bin => sysmaster}/job/junit.rs (100%)
|
|
rename core/{bin => sysmaster}/job/manager.rs (100%)
|
|
rename core/{bin => sysmaster}/job/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/job/notify.rs (100%)
|
|
rename core/{bin => sysmaster}/job/rentry.rs (100%)
|
|
rename core/{bin => sysmaster}/job/stat.rs (100%)
|
|
rename core/{bin => sysmaster}/job/table.rs (100%)
|
|
rename core/{bin => sysmaster}/job/transaction.rs (100%)
|
|
rename core/{bin => sysmaster}/keep_alive/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/main.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/alive_timer.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/commands.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/config.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/pre_install.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/rentry.rs (100%)
|
|
rename core/{bin => sysmaster}/manager/signals.rs (100%)
|
|
rename core/{bin => sysmaster}/mount/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/mount/setup.rs (100%)
|
|
rename core/{bin => sysmaster}/plugin/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/base/load.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/base/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/base/relation.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/base/relation_atom.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/data/dep_conf.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/data/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/data/state.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/data/table.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/datastore/child.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/datastore/deps.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/datastore/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/datastore/sets.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/base.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/cgroup.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/child.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/condition.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/config.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/load.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/ratelimit.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/uentry.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/entry/unitx.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/execute/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/execute/spawn.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/manager.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/notify.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/rentry.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/runtime.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/sigchld.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/test/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/uload.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/util/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/unit/util/unit_file.rs (100%)
|
|
rename core/{bin => sysmaster}/utils/mod.rs (100%)
|
|
rename core/{bin => sysmaster}/utils/table.rs (100%)
|
|
delete mode 100644 exts/sctl/Cargo.toml
|
|
rename {exts/init => init}/Cargo.toml (81%)
|
|
rename {exts/init => init}/src/main.rs (100%)
|
|
rename {exts/init => init}/src/runtime/comm.rs (100%)
|
|
rename {exts/init => init}/src/runtime/epoll.rs (100%)
|
|
rename {exts/init => init}/src/runtime/mod.rs (100%)
|
|
rename {exts/init => init}/src/runtime/param.rs (100%)
|
|
rename {exts/init => init}/src/runtime/signals.rs (100%)
|
|
rename {exts/init => init}/src/runtime/timer.rs (100%)
|
|
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index 089e7ab..f97be77 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -7,12 +7,16 @@ build = "build.rs"
|
|
|
|
[lib]
|
|
name = "sysmaster"
|
|
-path = "core/lib/lib.rs"
|
|
+path = "core/libsysmaster/lib.rs"
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
[[bin]]
|
|
name = "sysmaster"
|
|
-path = "core/bin/main.rs"
|
|
+path = "core/sysmaster/main.rs"
|
|
+
|
|
+[[bin]]
|
|
+name = "sctl"
|
|
+path = "core/sctl/main.rs"
|
|
|
|
[dev-dependencies.libtests]
|
|
path = "libs/libtests"
|
|
@@ -111,9 +111,9 @@ overflow-checks = false
|
|
|
|
[workspace]
|
|
members = [
|
|
+ # sysmaster-init
|
|
+ "init",
|
|
# external binaries
|
|
- "exts/init",
|
|
- "exts/sctl",
|
|
"exts/hostname_setup",
|
|
#internal libraries crates
|
|
"libs/cmdproto",
|
|
diff --git a/core/lib/error.rs b/core/libsysmaster/error.rs
|
|
similarity index 100%
|
|
rename from core/lib/error.rs
|
|
rename to core/libsysmaster/error.rs
|
|
diff --git a/core/lib/exec/base.rs b/core/libsysmaster/exec/base.rs
|
|
similarity index 100%
|
|
rename from core/lib/exec/base.rs
|
|
rename to core/libsysmaster/exec/base.rs
|
|
diff --git a/core/lib/exec/cmd.rs b/core/libsysmaster/exec/cmd.rs
|
|
similarity index 100%
|
|
rename from core/lib/exec/cmd.rs
|
|
rename to core/libsysmaster/exec/cmd.rs
|
|
diff --git a/core/lib/exec/mod.rs b/core/libsysmaster/exec/mod.rs
|
|
similarity index 100%
|
|
rename from core/lib/exec/mod.rs
|
|
rename to core/libsysmaster/exec/mod.rs
|
|
diff --git a/core/lib/lib.rs b/core/libsysmaster/lib.rs
|
|
similarity index 100%
|
|
rename from core/lib/lib.rs
|
|
rename to core/libsysmaster/lib.rs
|
|
diff --git a/core/lib/rel/api.rs b/core/libsysmaster/rel/api.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/api.rs
|
|
rename to core/libsysmaster/rel/api.rs
|
|
diff --git a/core/lib/rel/base.rs b/core/libsysmaster/rel/base.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/base.rs
|
|
rename to core/libsysmaster/rel/base.rs
|
|
diff --git a/core/lib/rel/enable.rs b/core/libsysmaster/rel/enable.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/enable.rs
|
|
rename to core/libsysmaster/rel/enable.rs
|
|
diff --git a/core/lib/rel/history.rs b/core/libsysmaster/rel/history.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/history.rs
|
|
rename to core/libsysmaster/rel/history.rs
|
|
diff --git a/core/lib/rel/last.rs b/core/libsysmaster/rel/last.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/last.rs
|
|
rename to core/libsysmaster/rel/last.rs
|
|
diff --git a/core/lib/rel/mod.rs b/core/libsysmaster/rel/mod.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/mod.rs
|
|
rename to core/libsysmaster/rel/mod.rs
|
|
diff --git a/core/lib/rel/pending.rs b/core/libsysmaster/rel/pending.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/pending.rs
|
|
rename to core/libsysmaster/rel/pending.rs
|
|
diff --git a/core/lib/rel/station.rs b/core/libsysmaster/rel/station.rs
|
|
similarity index 100%
|
|
rename from core/lib/rel/station.rs
|
|
rename to core/libsysmaster/rel/station.rs
|
|
diff --git a/core/lib/serialize.rs b/core/libsysmaster/serialize.rs
|
|
similarity index 100%
|
|
rename from core/lib/serialize.rs
|
|
rename to core/libsysmaster/serialize.rs
|
|
diff --git a/core/lib/unit/base.rs b/core/libsysmaster/unit/base.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/base.rs
|
|
rename to core/libsysmaster/unit/base.rs
|
|
diff --git a/core/lib/unit/deps.rs b/core/libsysmaster/unit/deps.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/deps.rs
|
|
rename to core/libsysmaster/unit/deps.rs
|
|
diff --git a/core/lib/unit/kill.rs b/core/libsysmaster/unit/kill.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/kill.rs
|
|
rename to core/libsysmaster/unit/kill.rs
|
|
diff --git a/core/lib/unit/mod.rs b/core/libsysmaster/unit/mod.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/mod.rs
|
|
rename to core/libsysmaster/unit/mod.rs
|
|
diff --git a/core/lib/unit/state.rs b/core/libsysmaster/unit/state.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/state.rs
|
|
rename to core/libsysmaster/unit/state.rs
|
|
diff --git a/core/lib/unit/umif.rs b/core/libsysmaster/unit/umif.rs
|
|
similarity index 100%
|
|
rename from core/lib/unit/umif.rs
|
|
rename to core/libsysmaster/unit/umif.rs
|
|
diff --git a/core/lib/utils/fd.rs b/core/libsysmaster/utils/fd.rs
|
|
similarity index 100%
|
|
rename from core/lib/utils/fd.rs
|
|
rename to core/libsysmaster/utils/fd.rs
|
|
diff --git a/core/lib/utils/mod.rs b/core/libsysmaster/utils/mod.rs
|
|
similarity index 100%
|
|
rename from core/lib/utils/mod.rs
|
|
rename to core/libsysmaster/utils/mod.rs
|
|
diff --git a/exts/sctl/src/main.rs b/core/sctl/main.rs
|
|
similarity index 100%
|
|
rename from exts/sctl/src/main.rs
|
|
rename to core/sctl/main.rs
|
|
diff --git a/core/bin/job/alloc.rs b/core/sysmaster/job/alloc.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/alloc.rs
|
|
rename to core/sysmaster/job/alloc.rs
|
|
diff --git a/core/bin/job/entry.rs b/core/sysmaster/job/entry.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/entry.rs
|
|
rename to core/sysmaster/job/entry.rs
|
|
diff --git a/core/bin/job/junit.rs b/core/sysmaster/job/junit.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/junit.rs
|
|
rename to core/sysmaster/job/junit.rs
|
|
diff --git a/core/bin/job/manager.rs b/core/sysmaster/job/manager.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/manager.rs
|
|
rename to core/sysmaster/job/manager.rs
|
|
diff --git a/core/bin/job/mod.rs b/core/sysmaster/job/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/mod.rs
|
|
rename to core/sysmaster/job/mod.rs
|
|
diff --git a/core/bin/job/notify.rs b/core/sysmaster/job/notify.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/notify.rs
|
|
rename to core/sysmaster/job/notify.rs
|
|
diff --git a/core/bin/job/rentry.rs b/core/sysmaster/job/rentry.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/rentry.rs
|
|
rename to core/sysmaster/job/rentry.rs
|
|
diff --git a/core/bin/job/stat.rs b/core/sysmaster/job/stat.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/stat.rs
|
|
rename to core/sysmaster/job/stat.rs
|
|
diff --git a/core/bin/job/table.rs b/core/sysmaster/job/table.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/table.rs
|
|
rename to core/sysmaster/job/table.rs
|
|
diff --git a/core/bin/job/transaction.rs b/core/sysmaster/job/transaction.rs
|
|
similarity index 100%
|
|
rename from core/bin/job/transaction.rs
|
|
rename to core/sysmaster/job/transaction.rs
|
|
diff --git a/core/bin/keep_alive/mod.rs b/core/sysmaster/keep_alive/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/keep_alive/mod.rs
|
|
rename to core/sysmaster/keep_alive/mod.rs
|
|
diff --git a/core/bin/main.rs b/core/sysmaster/main.rs
|
|
similarity index 100%
|
|
rename from core/bin/main.rs
|
|
rename to core/sysmaster/main.rs
|
|
diff --git a/core/bin/manager/alive_timer.rs b/core/sysmaster/manager/alive_timer.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/alive_timer.rs
|
|
rename to core/sysmaster/manager/alive_timer.rs
|
|
diff --git a/core/bin/manager/commands.rs b/core/sysmaster/manager/commands.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/commands.rs
|
|
rename to core/sysmaster/manager/commands.rs
|
|
diff --git a/core/bin/manager/config.rs b/core/sysmaster/manager/config.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/config.rs
|
|
rename to core/sysmaster/manager/config.rs
|
|
diff --git a/core/bin/manager/mod.rs b/core/sysmaster/manager/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/mod.rs
|
|
rename to core/sysmaster/manager/mod.rs
|
|
diff --git a/core/bin/manager/pre_install.rs b/core/sysmaster/manager/pre_install.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/pre_install.rs
|
|
rename to core/sysmaster/manager/pre_install.rs
|
|
diff --git a/core/bin/manager/rentry.rs b/core/sysmaster/manager/rentry.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/rentry.rs
|
|
rename to core/sysmaster/manager/rentry.rs
|
|
diff --git a/core/bin/manager/signals.rs b/core/sysmaster/manager/signals.rs
|
|
similarity index 100%
|
|
rename from core/bin/manager/signals.rs
|
|
rename to core/sysmaster/manager/signals.rs
|
|
diff --git a/core/bin/mount/mod.rs b/core/sysmaster/mount/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/mount/mod.rs
|
|
rename to core/sysmaster/mount/mod.rs
|
|
diff --git a/core/bin/mount/setup.rs b/core/sysmaster/mount/setup.rs
|
|
similarity index 100%
|
|
rename from core/bin/mount/setup.rs
|
|
rename to core/sysmaster/mount/setup.rs
|
|
diff --git a/core/bin/plugin/mod.rs b/core/sysmaster/plugin/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/plugin/mod.rs
|
|
rename to core/sysmaster/plugin/mod.rs
|
|
diff --git a/core/bin/unit/base/load.rs b/core/sysmaster/unit/base/load.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/base/load.rs
|
|
rename to core/sysmaster/unit/base/load.rs
|
|
diff --git a/core/bin/unit/base/mod.rs b/core/sysmaster/unit/base/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/base/mod.rs
|
|
rename to core/sysmaster/unit/base/mod.rs
|
|
diff --git a/core/bin/unit/base/relation.rs b/core/sysmaster/unit/base/relation.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/base/relation.rs
|
|
rename to core/sysmaster/unit/base/relation.rs
|
|
diff --git a/core/bin/unit/base/relation_atom.rs b/core/sysmaster/unit/base/relation_atom.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/base/relation_atom.rs
|
|
rename to core/sysmaster/unit/base/relation_atom.rs
|
|
diff --git a/core/bin/unit/data/dep_conf.rs b/core/sysmaster/unit/data/dep_conf.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/data/dep_conf.rs
|
|
rename to core/sysmaster/unit/data/dep_conf.rs
|
|
diff --git a/core/bin/unit/data/mod.rs b/core/sysmaster/unit/data/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/data/mod.rs
|
|
rename to core/sysmaster/unit/data/mod.rs
|
|
diff --git a/core/bin/unit/data/state.rs b/core/sysmaster/unit/data/state.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/data/state.rs
|
|
rename to core/sysmaster/unit/data/state.rs
|
|
diff --git a/core/bin/unit/data/table.rs b/core/sysmaster/unit/data/table.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/data/table.rs
|
|
rename to core/sysmaster/unit/data/table.rs
|
|
diff --git a/core/bin/unit/datastore/child.rs b/core/sysmaster/unit/datastore/child.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/datastore/child.rs
|
|
rename to core/sysmaster/unit/datastore/child.rs
|
|
diff --git a/core/bin/unit/datastore/deps.rs b/core/sysmaster/unit/datastore/deps.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/datastore/deps.rs
|
|
rename to core/sysmaster/unit/datastore/deps.rs
|
|
diff --git a/core/bin/unit/datastore/mod.rs b/core/sysmaster/unit/datastore/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/datastore/mod.rs
|
|
rename to core/sysmaster/unit/datastore/mod.rs
|
|
diff --git a/core/bin/unit/datastore/sets.rs b/core/sysmaster/unit/datastore/sets.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/datastore/sets.rs
|
|
rename to core/sysmaster/unit/datastore/sets.rs
|
|
diff --git a/core/bin/unit/entry/base.rs b/core/sysmaster/unit/entry/base.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/base.rs
|
|
rename to core/sysmaster/unit/entry/base.rs
|
|
diff --git a/core/bin/unit/entry/cgroup.rs b/core/sysmaster/unit/entry/cgroup.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/cgroup.rs
|
|
rename to core/sysmaster/unit/entry/cgroup.rs
|
|
diff --git a/core/bin/unit/entry/child.rs b/core/sysmaster/unit/entry/child.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/child.rs
|
|
rename to core/sysmaster/unit/entry/child.rs
|
|
diff --git a/core/bin/unit/entry/condition.rs b/core/sysmaster/unit/entry/condition.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/condition.rs
|
|
rename to core/sysmaster/unit/entry/condition.rs
|
|
diff --git a/core/bin/unit/entry/config.rs b/core/sysmaster/unit/entry/config.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/config.rs
|
|
rename to core/sysmaster/unit/entry/config.rs
|
|
diff --git a/core/bin/unit/entry/load.rs b/core/sysmaster/unit/entry/load.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/load.rs
|
|
rename to core/sysmaster/unit/entry/load.rs
|
|
diff --git a/core/bin/unit/entry/mod.rs b/core/sysmaster/unit/entry/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/mod.rs
|
|
rename to core/sysmaster/unit/entry/mod.rs
|
|
diff --git a/core/bin/unit/entry/ratelimit.rs b/core/sysmaster/unit/entry/ratelimit.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/ratelimit.rs
|
|
rename to core/sysmaster/unit/entry/ratelimit.rs
|
|
diff --git a/core/bin/unit/entry/uentry.rs b/core/sysmaster/unit/entry/uentry.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/uentry.rs
|
|
rename to core/sysmaster/unit/entry/uentry.rs
|
|
diff --git a/core/bin/unit/entry/unitx.rs b/core/sysmaster/unit/entry/unitx.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/entry/unitx.rs
|
|
rename to core/sysmaster/unit/entry/unitx.rs
|
|
diff --git a/core/bin/unit/execute/mod.rs b/core/sysmaster/unit/execute/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/execute/mod.rs
|
|
rename to core/sysmaster/unit/execute/mod.rs
|
|
diff --git a/core/bin/unit/execute/spawn.rs b/core/sysmaster/unit/execute/spawn.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/execute/spawn.rs
|
|
rename to core/sysmaster/unit/execute/spawn.rs
|
|
diff --git a/core/bin/unit/manager.rs b/core/sysmaster/unit/manager.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/manager.rs
|
|
rename to core/sysmaster/unit/manager.rs
|
|
diff --git a/core/bin/unit/mod.rs b/core/sysmaster/unit/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/mod.rs
|
|
rename to core/sysmaster/unit/mod.rs
|
|
diff --git a/core/bin/unit/notify.rs b/core/sysmaster/unit/notify.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/notify.rs
|
|
rename to core/sysmaster/unit/notify.rs
|
|
diff --git a/core/bin/unit/rentry.rs b/core/sysmaster/unit/rentry.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/rentry.rs
|
|
rename to core/sysmaster/unit/rentry.rs
|
|
diff --git a/core/bin/unit/runtime.rs b/core/sysmaster/unit/runtime.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/runtime.rs
|
|
rename to core/sysmaster/unit/runtime.rs
|
|
diff --git a/core/bin/unit/sigchld.rs b/core/sysmaster/unit/sigchld.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/sigchld.rs
|
|
rename to core/sysmaster/unit/sigchld.rs
|
|
diff --git a/core/bin/unit/test/mod.rs b/core/sysmaster/unit/test/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/test/mod.rs
|
|
rename to core/sysmaster/unit/test/mod.rs
|
|
diff --git a/core/bin/unit/uload.rs b/core/sysmaster/unit/uload.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/uload.rs
|
|
rename to core/sysmaster/unit/uload.rs
|
|
diff --git a/core/bin/unit/util/mod.rs b/core/sysmaster/unit/util/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/util/mod.rs
|
|
rename to core/sysmaster/unit/util/mod.rs
|
|
diff --git a/core/bin/unit/util/unit_file.rs b/core/sysmaster/unit/util/unit_file.rs
|
|
similarity index 100%
|
|
rename from core/bin/unit/util/unit_file.rs
|
|
rename to core/sysmaster/unit/util/unit_file.rs
|
|
diff --git a/core/bin/utils/mod.rs b/core/sysmaster/utils/mod.rs
|
|
similarity index 100%
|
|
rename from core/bin/utils/mod.rs
|
|
rename to core/sysmaster/utils/mod.rs
|
|
diff --git a/core/bin/utils/table.rs b/core/sysmaster/utils/table.rs
|
|
similarity index 100%
|
|
rename from core/bin/utils/table.rs
|
|
rename to core/sysmaster/utils/table.rs
|
|
diff --git a/exts/sctl/Cargo.toml b/exts/sctl/Cargo.toml
|
|
deleted file mode 100644
|
|
index 21c00c7..0000000
|
|
--- a/exts/sctl/Cargo.toml
|
|
+++ /dev/null
|
|
@@ -1,13 +0,0 @@
|
|
-[package]
|
|
-name = "sctl"
|
|
-version = "0.2.4"
|
|
-edition = "2021"
|
|
-
|
|
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
-
|
|
-[dependencies]
|
|
-clap = { version = "3.1.8", features = ["derive"] }
|
|
-cmdproto = { path = "../../libs/cmdproto" }
|
|
-basic = { path = "../../libs/basic" }
|
|
-nix = "0.24"
|
|
-constants = { path = "../../libs/constants" }
|
|
diff --git a/exts/init/Cargo.toml b/init/Cargo.toml
|
|
similarity index 81%
|
|
rename from exts/init/Cargo.toml
|
|
rename to init/Cargo.toml
|
|
index f72b52a..6dcfb61 100644
|
|
--- a/exts/init/Cargo.toml
|
|
+++ b/init/Cargo.toml
|
|
@@ -6,6 +6,6 @@ edition = "2021"
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
[dependencies]
|
|
-constants = { path = "../../libs/constants" }
|
|
+constants = { path = "../libs/constants" }
|
|
libc = "0.2.*"
|
|
nix = "0.24"
|
|
diff --git a/exts/init/src/main.rs b/init/src/main.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/main.rs
|
|
rename to init/src/main.rs
|
|
diff --git a/exts/init/src/runtime/comm.rs b/init/src/runtime/comm.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/comm.rs
|
|
rename to init/src/runtime/comm.rs
|
|
diff --git a/exts/init/src/runtime/epoll.rs b/init/src/runtime/epoll.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/epoll.rs
|
|
rename to init/src/runtime/epoll.rs
|
|
diff --git a/exts/init/src/runtime/mod.rs b/init/src/runtime/mod.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/mod.rs
|
|
rename to init/src/runtime/mod.rs
|
|
diff --git a/exts/init/src/runtime/param.rs b/init/src/runtime/param.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/param.rs
|
|
rename to init/src/runtime/param.rs
|
|
diff --git a/exts/init/src/runtime/signals.rs b/init/src/runtime/signals.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/signals.rs
|
|
rename to init/src/runtime/signals.rs
|
|
diff --git a/exts/init/src/runtime/timer.rs b/init/src/runtime/timer.rs
|
|
similarity index 100%
|
|
rename from exts/init/src/runtime/timer.rs
|
|
rename to init/src/runtime/timer.rs
|
|
--
|
|
2.33.0
|
|
|