diff --git a/Cargo.toml b/Cargo.toml index e5b4d61e49a8576cd2adcc5799f6d4b2db317fb0..b7ae88b36ed2ef1273df5c186ca9d2ed24e728e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,5 @@ [workspace] members = [ - "libs/utils", - "libs/event", - "libs/dbus", - "src/main", + "src/init", "tests", ] diff --git a/Dockerfile b/Dockerfile index 06bf30adeaa9ece3217661fc323d8a76144964df..d1d0fe50ce974e4dafb606600b76b7eb0580bac8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM scratch #ADD target/x86_64-unknown-linux-musl/debug/process1 /sbin/init -COPY target/x86_64-unknown-linux-musl/debug/process1 /sbin/init +COPY target/x86_64-unknown-linux-musl/debug/init /sbin/init CMD ["/sbin/init"] diff --git a/libs/cgroup/Cargo.toml b/libs/cgroup/Cargo.toml deleted file mode 100644 index b99993879713154f5c9ed121e69ce4102314708d..0000000000000000000000000000000000000000 --- a/libs/cgroup/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "cgroup" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/cgroup/src/lib.rs b/libs/cgroup/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/libs/cgroup/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/dbus/Cargo.toml b/libs/dbus/Cargo.toml deleted file mode 100644 index ad47cd972b989fe55da2b8a12461f062f047ae49..0000000000000000000000000000000000000000 --- a/libs/dbus/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "dbus" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/dbus/src/lib.rs b/libs/dbus/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/libs/dbus/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/job/Cargo.toml b/libs/job/Cargo.toml deleted file mode 100644 index 2c506d8c879b9e31a5d0ffa9109b8d3ddb8103c3..0000000000000000000000000000000000000000 --- a/libs/job/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "job" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/job/src/lib.rs b/libs/job/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/libs/job/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/udev/Cargo.toml b/libs/udev/Cargo.toml deleted file mode 100644 index e9d2444cfd42b3c16b6868f60baf7578681a20c3..0000000000000000000000000000000000000000 --- a/libs/udev/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "udev" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/udev/src/lib.rs b/libs/udev/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/libs/udev/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/unit/Cargo.toml b/libs/unit/Cargo.toml deleted file mode 100644 index 7a7e1f703428788d7861d414dc23b839270bb453..0000000000000000000000000000000000000000 --- a/libs/unit/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "unit" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/unit/src/lib.rs b/libs/unit/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/libs/unit/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/src/bootup/Cargo.toml b/src/bootup/Cargo.toml deleted file mode 100644 index b03c8583902857264e5c14d8c6d19413f27992f2..0000000000000000000000000000000000000000 --- a/src/bootup/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "bootup" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/bootup/src/main.rs b/src/bootup/src/main.rs deleted file mode 100644 index e7a11a969c037e00a796aafeff6258501ec15e9a..0000000000000000000000000000000000000000 --- a/src/bootup/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/libs/event/Cargo.toml b/src/event/Cargo.toml similarity index 100% rename from libs/event/Cargo.toml rename to src/event/Cargo.toml diff --git a/libs/event/src/lib.rs b/src/event/src/lib.rs similarity index 100% rename from libs/event/src/lib.rs rename to src/event/src/lib.rs diff --git a/src/main/Cargo.toml b/src/init/Cargo.toml similarity index 50% rename from src/main/Cargo.toml rename to src/init/Cargo.toml index 18d0ca50ebcf8dce7601ee7ffbb749119f133b40..c628da1aef2f64a81ad13289048b64d1b9c322c0 100644 --- a/src/main/Cargo.toml +++ b/src/init/Cargo.toml @@ -1,20 +1,13 @@ [package] -name = "process1" +name = "init" version = "0.1.0" -authors = ["Shinwell Hu "] +authors = ["h00277865 "] edition = "2018" -license = "MulanPSL-2.0" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] signal-hook = { version = "0.3.7", features = ["extended-siginfo"] } signal-hook-registry = "" -#socket2 = { version = "0.3.8"} -#async-std = { version = "", features = ["unstable"] } -#async-std = { version = "1.9" } -#async-attributes = "" -utils = { path = "../../libs/utils" } +utils = { path = "../utils" } libc = { version = "^0.2" } - diff --git a/src/main/src/main.rs b/src/init/src/main.rs similarity index 100% rename from src/main/src/main.rs rename to src/init/src/main.rs diff --git a/src/loggerd/Cargo.toml b/src/loggerd/Cargo.toml deleted file mode 100644 index 4315a66b33c75bd4beafa317841a5b7c64ef1451..0000000000000000000000000000000000000000 --- a/src/loggerd/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "loggerd" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/loggerd/src/main.rs b/src/loggerd/src/main.rs deleted file mode 100644 index e7a11a969c037e00a796aafeff6258501ec15e9a..0000000000000000000000000000000000000000 --- a/src/loggerd/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/logind/Cargo.toml b/src/logind/Cargo.toml deleted file mode 100644 index ca1b9e38a1492d0cc2bd9ba3969f388112ed65b4..0000000000000000000000000000000000000000 --- a/src/logind/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "logind" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/logind/src/lib.rs b/src/logind/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/src/logind/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/src/manager/Cargo.toml b/src/manager/Cargo.toml deleted file mode 100644 index 2b70869722790ea970341e9bdbb4752e6b868cd9..0000000000000000000000000000000000000000 --- a/src/manager/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "manager" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/manager/src/main.rs b/src/manager/src/main.rs deleted file mode 100644 index e7a11a969c037e00a796aafeff6258501ec15e9a..0000000000000000000000000000000000000000 --- a/src/manager/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/shutdown/Cargo.toml b/src/shutdown/Cargo.toml deleted file mode 100644 index ac0f04e4c523441b4b123359f4a7439b74edd8f3..0000000000000000000000000000000000000000 --- a/src/shutdown/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "shutdown" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/shutdown/src/main.rs b/src/shutdown/src/main.rs deleted file mode 100644 index e7a11a969c037e00a796aafeff6258501ec15e9a..0000000000000000000000000000000000000000 --- a/src/shutdown/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/udevd/Cargo.toml b/src/udevd/Cargo.toml deleted file mode 100644 index 76e2913930be5aebd16017a5404b4f1935e08d38..0000000000000000000000000000000000000000 --- a/src/udevd/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "udevd" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/udevd/src/lib.rs b/src/udevd/src/lib.rs deleted file mode 100644 index 31e1bb209f98ec5fc6b7cbea4c4766a555c87247..0000000000000000000000000000000000000000 --- a/src/udevd/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/utils/Cargo.toml b/src/utils/Cargo.toml similarity index 100% rename from libs/utils/Cargo.toml rename to src/utils/Cargo.toml diff --git a/libs/utils/src/lib.rs b/src/utils/src/lib.rs similarity index 100% rename from libs/utils/src/lib.rs rename to src/utils/src/lib.rs diff --git a/libs/utils/src/macros.rs b/src/utils/src/macros.rs similarity index 100% rename from libs/utils/src/macros.rs rename to src/utils/src/macros.rs