From 27203ec828904288d9ae597187b72c6153b043de Mon Sep 17 00:00:00 2001 From: hexiaowen Date: Fri, 3 Nov 2023 08:15:54 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!892=20:?= =?UTF-8?q?=20chore:=20mv=20factory=20to=20fcty=20and=20mv=20next-generati?= =?UTF-8?q?on=20to=20ng'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- {fcty => factory}/etc/sysmaster/plugin.conf | 0 {fcty => factory}/etc/sysmaster/system.conf | 0 .../usr/lib/sysmaster/system/basic.target | 0 .../lib/sysmaster/system/multi-user.target | 0 .../usr/lib/sysmaster/system/shutdown.target | 0 .../usr/lib/sysmaster/system/sockets.target | 0 .../lib/sysmaster/system/sshd-keygen.target | 0 .../lib/sysmaster/system/sshd-keygen@.service | 0 .../usr/lib/sysmaster/system/sshd.service | 0 .../usr/lib/sysmaster/system/sysctl.service | 0 .../usr/lib/sysmaster/system/sysinit.target | 0 .../usr/lib/sysmaster/system/syslog.socket | 0 .../usr/lib/sysmaster/system/syslog.target | 0 .../usr/lib/udev/rules.d/99-sysmaster.rules | 0 fcty/README.md | 33 ------------------- {next => next-generation}/Cargo.lock | 0 {next => next-generation}/Cargo.toml | 0 {next => next-generation}/README.md | 0 .../src/actor/dep/mod.rs | 0 .../src/actor/guard/mod.rs | 0 {next => next-generation}/src/actor/mod.rs | 0 .../src/actor/mount_monitor.rs | 0 .../src/actor/state/mod.rs | 0 {next => next-generation}/src/actor/test.rs | 0 .../src/actor/unit/mod.rs | 0 .../src/actor/unit/utils.rs | 0 {next => next-generation}/src/bin/sysrsctl.rs | 0 {next => next-generation}/src/fstab/mod.rs | 0 {next => next-generation}/src/main.rs | 0 .../src/unit/guard/mod.rs | 0 {next => next-generation}/src/unit/mod.rs | 0 .../src/unit/mount/loader.rs | 0 .../src/unit/mount/mod.rs | 0 .../src/unit/service/loader.rs | 0 .../src/unit/service/mod.rs | 0 .../src/unit/socket/loader.rs | 0 .../src/unit/socket/mod.rs | 0 .../src/unit/state/mod.rs | 0 .../src/unit/store/mod.rs | 0 .../src/unit/target/loader.rs | 0 .../src/unit/target/mod.rs | 0 .../src/util/dbus/mod.rs | 0 .../src/util/event/mod.rs | 0 .../src/util/event/signal.rs | 0 {next => next-generation}/src/util/loader.rs | 0 {next => next-generation}/src/util/mod.rs | 0 {next => next-generation}/src/util/mount.rs | 0 .../units/conflict-with-t1.service | 0 .../units/dbus-system.service | 0 {next => next-generation}/units/sleep.service | 0 .../units/socket_test.socket | 0 .../units/ssh-keygen-ecdsa.service | 0 .../units/ssh-keygen-ed25519.service | 0 .../units/ssh-keygen-rsa.service | 0 .../units/ssh-keygen.target | 0 {next => next-generation}/units/sshd.service | 0 {next => next-generation}/units/t0.service | 0 {next => next-generation}/units/t1.service | 0 59 files changed, 1 insertion(+), 35 deletions(-) rename {fcty => factory}/etc/sysmaster/plugin.conf (100%) rename {fcty => factory}/etc/sysmaster/system.conf (100%) rename {fcty => factory}/usr/lib/sysmaster/system/basic.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/multi-user.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/shutdown.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sockets.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sshd-keygen.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sshd-keygen@.service (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sshd.service (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sysctl.service (100%) rename {fcty => factory}/usr/lib/sysmaster/system/sysinit.target (100%) rename {fcty => factory}/usr/lib/sysmaster/system/syslog.socket (100%) rename {fcty => factory}/usr/lib/sysmaster/system/syslog.target (100%) rename {fcty => factory}/usr/lib/udev/rules.d/99-sysmaster.rules (100%) delete mode 100644 fcty/README.md rename {next => next-generation}/Cargo.lock (100%) rename {next => next-generation}/Cargo.toml (100%) rename {next => next-generation}/README.md (100%) rename {next => next-generation}/src/actor/dep/mod.rs (100%) rename {next => next-generation}/src/actor/guard/mod.rs (100%) rename {next => next-generation}/src/actor/mod.rs (100%) rename {next => next-generation}/src/actor/mount_monitor.rs (100%) rename {next => next-generation}/src/actor/state/mod.rs (100%) rename {next => next-generation}/src/actor/test.rs (100%) rename {next => next-generation}/src/actor/unit/mod.rs (100%) rename {next => next-generation}/src/actor/unit/utils.rs (100%) rename {next => next-generation}/src/bin/sysrsctl.rs (100%) rename {next => next-generation}/src/fstab/mod.rs (100%) rename {next => next-generation}/src/main.rs (100%) rename {next => next-generation}/src/unit/guard/mod.rs (100%) rename {next => next-generation}/src/unit/mod.rs (100%) rename {next => next-generation}/src/unit/mount/loader.rs (100%) rename {next => next-generation}/src/unit/mount/mod.rs (100%) rename {next => next-generation}/src/unit/service/loader.rs (100%) rename {next => next-generation}/src/unit/service/mod.rs (100%) rename {next => next-generation}/src/unit/socket/loader.rs (100%) rename {next => next-generation}/src/unit/socket/mod.rs (100%) rename {next => next-generation}/src/unit/state/mod.rs (100%) rename {next => next-generation}/src/unit/store/mod.rs (100%) rename {next => next-generation}/src/unit/target/loader.rs (100%) rename {next => next-generation}/src/unit/target/mod.rs (100%) rename {next => next-generation}/src/util/dbus/mod.rs (100%) rename {next => next-generation}/src/util/event/mod.rs (100%) rename {next => next-generation}/src/util/event/signal.rs (100%) rename {next => next-generation}/src/util/loader.rs (100%) rename {next => next-generation}/src/util/mod.rs (100%) rename {next => next-generation}/src/util/mount.rs (100%) rename {next => next-generation}/units/conflict-with-t1.service (100%) rename {next => next-generation}/units/dbus-system.service (100%) rename {next => next-generation}/units/sleep.service (100%) rename {next => next-generation}/units/socket_test.socket (100%) rename {next => next-generation}/units/ssh-keygen-ecdsa.service (100%) rename {next => next-generation}/units/ssh-keygen-ed25519.service (100%) rename {next => next-generation}/units/ssh-keygen-rsa.service (100%) rename {next => next-generation}/units/ssh-keygen.target (100%) rename {next => next-generation}/units/sshd.service (100%) rename {next => next-generation}/units/t0.service (100%) rename {next => next-generation}/units/t1.service (100%) diff --git a/README.md b/README.md index 85b94796..d52b2b4a 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,7 @@ ls tools daemon类型的bin crate的目录以d结尾。 ```text -/ (sysmaster) -|...init (init进程) +/ (init) |...libs (对外接口) | |...libtests (test lib crate) | |...cgroup (cgroup lib crate) diff --git a/fcty/etc/sysmaster/plugin.conf b/factory/etc/sysmaster/plugin.conf similarity index 100% rename from fcty/etc/sysmaster/plugin.conf rename to factory/etc/sysmaster/plugin.conf diff --git a/fcty/etc/sysmaster/system.conf b/factory/etc/sysmaster/system.conf similarity index 100% rename from fcty/etc/sysmaster/system.conf rename to factory/etc/sysmaster/system.conf diff --git a/fcty/usr/lib/sysmaster/system/basic.target b/factory/usr/lib/sysmaster/system/basic.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/basic.target rename to factory/usr/lib/sysmaster/system/basic.target diff --git a/fcty/usr/lib/sysmaster/system/multi-user.target b/factory/usr/lib/sysmaster/system/multi-user.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/multi-user.target rename to factory/usr/lib/sysmaster/system/multi-user.target diff --git a/fcty/usr/lib/sysmaster/system/shutdown.target b/factory/usr/lib/sysmaster/system/shutdown.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/shutdown.target rename to factory/usr/lib/sysmaster/system/shutdown.target diff --git a/fcty/usr/lib/sysmaster/system/sockets.target b/factory/usr/lib/sysmaster/system/sockets.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/sockets.target rename to factory/usr/lib/sysmaster/system/sockets.target diff --git a/fcty/usr/lib/sysmaster/system/sshd-keygen.target b/factory/usr/lib/sysmaster/system/sshd-keygen.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/sshd-keygen.target rename to factory/usr/lib/sysmaster/system/sshd-keygen.target diff --git a/fcty/usr/lib/sysmaster/system/sshd-keygen@.service b/factory/usr/lib/sysmaster/system/sshd-keygen@.service similarity index 100% rename from fcty/usr/lib/sysmaster/system/sshd-keygen@.service rename to factory/usr/lib/sysmaster/system/sshd-keygen@.service diff --git a/fcty/usr/lib/sysmaster/system/sshd.service b/factory/usr/lib/sysmaster/system/sshd.service similarity index 100% rename from fcty/usr/lib/sysmaster/system/sshd.service rename to factory/usr/lib/sysmaster/system/sshd.service diff --git a/fcty/usr/lib/sysmaster/system/sysctl.service b/factory/usr/lib/sysmaster/system/sysctl.service similarity index 100% rename from fcty/usr/lib/sysmaster/system/sysctl.service rename to factory/usr/lib/sysmaster/system/sysctl.service diff --git a/fcty/usr/lib/sysmaster/system/sysinit.target b/factory/usr/lib/sysmaster/system/sysinit.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/sysinit.target rename to factory/usr/lib/sysmaster/system/sysinit.target diff --git a/fcty/usr/lib/sysmaster/system/syslog.socket b/factory/usr/lib/sysmaster/system/syslog.socket similarity index 100% rename from fcty/usr/lib/sysmaster/system/syslog.socket rename to factory/usr/lib/sysmaster/system/syslog.socket diff --git a/fcty/usr/lib/sysmaster/system/syslog.target b/factory/usr/lib/sysmaster/system/syslog.target similarity index 100% rename from fcty/usr/lib/sysmaster/system/syslog.target rename to factory/usr/lib/sysmaster/system/syslog.target diff --git a/fcty/usr/lib/udev/rules.d/99-sysmaster.rules b/factory/usr/lib/udev/rules.d/99-sysmaster.rules similarity index 100% rename from fcty/usr/lib/udev/rules.d/99-sysmaster.rules rename to factory/usr/lib/udev/rules.d/99-sysmaster.rules diff --git a/fcty/README.md b/fcty/README.md deleted file mode 100644 index 6ca9f5df..00000000 --- a/fcty/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# 系统配置和文件 - -## 目的 -此目录用于存放系统的配置文件和特殊文件。这些文件对系统的正常运行和定制化配置非常重要。通过将它们存放在这个目录中，可以更容易地管理和维护系统配置。 - -## 目录结构 -目录结构以根目录的相对路径存放。以下是目录中可能包含的子目录和文件的示例： - -- `etc/`：存放系统全局配置文件 - - `etc/network/`：网络配置文件 - - `etc/apache2/`：Apache服务器的配置文件 -- `usr/`：存放特殊文件和工具 - - `usr/local/bin/`：自定义的可执行文件 - - `usr/share/`：共享的数据文件 -- `var/`：存放可变数据，如日志文件 - - `var/log/`：系统日志文件 - - `var/cache/`：缓存文件 - -## 如何使用 -1. 根据需要，将系统配置文件放在`etc/`目录中。这些文件可能包括网络配置、服务配置等。 -2. 如果您有自定义的可执行文件或特殊工具，将它们放在`usr/local/bin/`目录中，以便轻松访问。 -3. 共享的数据文件可以存放在`usr/share/`目录中。 -4. 日志文件应该被记录在`var/log/`目录中，以便进行故障排查和监视。 -5. 如果有需要，可以使用`var/cache/`目录存放缓存文件。 - -## 注意事项 -- 请小心管理和保护存放在此目录中的文件，以确保系统的稳定性和安全性。 -- 遵循最佳实践，定期备份系统配置文件和特殊文件，以便在需要时进行还原。 -- 请确保文件和目录的权限设置正确，以防止未经授权的访问。 -- 如果文件是用来测试的, 建议使用`test_`前缀来加以区分。 -- 如果将目录下的文件安装到系统中, 请删除文档文件及测试文件。 - -这个目录的结构和内容应该根据您的系统和项目的具体需求进行定制。这个README文件旨在提供一个基本的指南，以帮助您组织和管理系统的配置和特殊文件。 diff --git a/next/Cargo.lock b/next-generation/Cargo.lock similarity index 100% rename from next/Cargo.lock rename to next-generation/Cargo.lock diff --git a/next/Cargo.toml b/next-generation/Cargo.toml similarity index 100% rename from next/Cargo.toml rename to next-generation/Cargo.toml diff --git a/next/README.md b/next-generation/README.md similarity index 100% rename from next/README.md rename to next-generation/README.md diff --git a/next/src/actor/dep/mod.rs b/next-generation/src/actor/dep/mod.rs similarity index 100% rename from next/src/actor/dep/mod.rs rename to next-generation/src/actor/dep/mod.rs diff --git a/next/src/actor/guard/mod.rs b/next-generation/src/actor/guard/mod.rs similarity index 100% rename from next/src/actor/guard/mod.rs rename to next-generation/src/actor/guard/mod.rs diff --git a/next/src/actor/mod.rs b/next-generation/src/actor/mod.rs similarity index 100% rename from next/src/actor/mod.rs rename to next-generation/src/actor/mod.rs diff --git a/next/src/actor/mount_monitor.rs b/next-generation/src/actor/mount_monitor.rs similarity index 100% rename from next/src/actor/mount_monitor.rs rename to next-generation/src/actor/mount_monitor.rs diff --git a/next/src/actor/state/mod.rs b/next-generation/src/actor/state/mod.rs similarity index 100% rename from next/src/actor/state/mod.rs rename to next-generation/src/actor/state/mod.rs diff --git a/next/src/actor/test.rs b/next-generation/src/actor/test.rs similarity index 100% rename from next/src/actor/test.rs rename to next-generation/src/actor/test.rs diff --git a/next/src/actor/unit/mod.rs b/next-generation/src/actor/unit/mod.rs similarity index 100% rename from next/src/actor/unit/mod.rs rename to next-generation/src/actor/unit/mod.rs diff --git a/next/src/actor/unit/utils.rs b/next-generation/src/actor/unit/utils.rs similarity index 100% rename from next/src/actor/unit/utils.rs rename to next-generation/src/actor/unit/utils.rs diff --git a/next/src/bin/sysrsctl.rs b/next-generation/src/bin/sysrsctl.rs similarity index 100% rename from next/src/bin/sysrsctl.rs rename to next-generation/src/bin/sysrsctl.rs diff --git a/next/src/fstab/mod.rs b/next-generation/src/fstab/mod.rs similarity index 100% rename from next/src/fstab/mod.rs rename to next-generation/src/fstab/mod.rs diff --git a/next/src/main.rs b/next-generation/src/main.rs similarity index 100% rename from next/src/main.rs rename to next-generation/src/main.rs diff --git a/next/src/unit/guard/mod.rs b/next-generation/src/unit/guard/mod.rs similarity index 100% rename from next/src/unit/guard/mod.rs rename to next-generation/src/unit/guard/mod.rs diff --git a/next/src/unit/mod.rs b/next-generation/src/unit/mod.rs similarity index 100% rename from next/src/unit/mod.rs rename to next-generation/src/unit/mod.rs diff --git a/next/src/unit/mount/loader.rs b/next-generation/src/unit/mount/loader.rs similarity index 100% rename from next/src/unit/mount/loader.rs rename to next-generation/src/unit/mount/loader.rs diff --git a/next/src/unit/mount/mod.rs b/next-generation/src/unit/mount/mod.rs similarity index 100% rename from next/src/unit/mount/mod.rs rename to next-generation/src/unit/mount/mod.rs diff --git a/next/src/unit/service/loader.rs b/next-generation/src/unit/service/loader.rs similarity index 100% rename from next/src/unit/service/loader.rs rename to next-generation/src/unit/service/loader.rs diff --git a/next/src/unit/service/mod.rs b/next-generation/src/unit/service/mod.rs similarity index 100% rename from next/src/unit/service/mod.rs rename to next-generation/src/unit/service/mod.rs diff --git a/next/src/unit/socket/loader.rs b/next-generation/src/unit/socket/loader.rs similarity index 100% rename from next/src/unit/socket/loader.rs rename to next-generation/src/unit/socket/loader.rs diff --git a/next/src/unit/socket/mod.rs b/next-generation/src/unit/socket/mod.rs similarity index 100% rename from next/src/unit/socket/mod.rs rename to next-generation/src/unit/socket/mod.rs diff --git a/next/src/unit/state/mod.rs b/next-generation/src/unit/state/mod.rs similarity index 100% rename from next/src/unit/state/mod.rs rename to next-generation/src/unit/state/mod.rs diff --git a/next/src/unit/store/mod.rs b/next-generation/src/unit/store/mod.rs similarity index 100% rename from next/src/unit/store/mod.rs rename to next-generation/src/unit/store/mod.rs diff --git a/next/src/unit/target/loader.rs b/next-generation/src/unit/target/loader.rs similarity index 100% rename from next/src/unit/target/loader.rs rename to next-generation/src/unit/target/loader.rs diff --git a/next/src/unit/target/mod.rs b/next-generation/src/unit/target/mod.rs similarity index 100% rename from next/src/unit/target/mod.rs rename to next-generation/src/unit/target/mod.rs diff --git a/next/src/util/dbus/mod.rs b/next-generation/src/util/dbus/mod.rs similarity index 100% rename from next/src/util/dbus/mod.rs rename to next-generation/src/util/dbus/mod.rs diff --git a/next/src/util/event/mod.rs b/next-generation/src/util/event/mod.rs similarity index 100% rename from next/src/util/event/mod.rs rename to next-generation/src/util/event/mod.rs diff --git a/next/src/util/event/signal.rs b/next-generation/src/util/event/signal.rs similarity index 100% rename from next/src/util/event/signal.rs rename to next-generation/src/util/event/signal.rs diff --git a/next/src/util/loader.rs b/next-generation/src/util/loader.rs similarity index 100% rename from next/src/util/loader.rs rename to next-generation/src/util/loader.rs diff --git a/next/src/util/mod.rs b/next-generation/src/util/mod.rs similarity index 100% rename from next/src/util/mod.rs rename to next-generation/src/util/mod.rs diff --git a/next/src/util/mount.rs b/next-generation/src/util/mount.rs similarity index 100% rename from next/src/util/mount.rs rename to next-generation/src/util/mount.rs diff --git a/next/units/conflict-with-t1.service b/next-generation/units/conflict-with-t1.service similarity index 100% rename from next/units/conflict-with-t1.service rename to next-generation/units/conflict-with-t1.service diff --git a/next/units/dbus-system.service b/next-generation/units/dbus-system.service similarity index 100% rename from next/units/dbus-system.service rename to next-generation/units/dbus-system.service diff --git a/next/units/sleep.service b/next-generation/units/sleep.service similarity index 100% rename from next/units/sleep.service rename to next-generation/units/sleep.service diff --git a/next/units/socket_test.socket b/next-generation/units/socket_test.socket similarity index 100% rename from next/units/socket_test.socket rename to next-generation/units/socket_test.socket diff --git a/next/units/ssh-keygen-ecdsa.service b/next-generation/units/ssh-keygen-ecdsa.service similarity index 100% rename from next/units/ssh-keygen-ecdsa.service rename to next-generation/units/ssh-keygen-ecdsa.service diff --git a/next/units/ssh-keygen-ed25519.service b/next-generation/units/ssh-keygen-ed25519.service similarity index 100% rename from next/units/ssh-keygen-ed25519.service rename to next-generation/units/ssh-keygen-ed25519.service diff --git a/next/units/ssh-keygen-rsa.service b/next-generation/units/ssh-keygen-rsa.service similarity index 100% rename from next/units/ssh-keygen-rsa.service rename to next-generation/units/ssh-keygen-rsa.service diff --git a/next/units/ssh-keygen.target b/next-generation/units/ssh-keygen.target similarity index 100% rename from next/units/ssh-keygen.target rename to next-generation/units/ssh-keygen.target diff --git a/next/units/sshd.service b/next-generation/units/sshd.service similarity index 100% rename from next/units/sshd.service rename to next-generation/units/sshd.service diff --git a/next/units/t0.service b/next-generation/units/t0.service similarity index 100% rename from next/units/t0.service rename to next-generation/units/t0.service diff --git a/next/units/t1.service b/next-generation/units/t1.service similarity index 100% rename from next/units/t1.service rename to next-generation/units/t1.service -- Gitee