Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add partial implementation of mount #46

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ loginutils = [
"getty"
]

mount = ["libmesabox/mount"]
# FIXME: this is only like this because we can't rename dependencies and we use the same macro in
# the tests that libmesabox uses to build
tar_util = ["libmesabox/tar_util"]
lsb = [
"tar_util"
"mount", "tar_util"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please split into multiple lines.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

]

ping = ["libmesabox/ping"]
Expand Down
4 changes: 3 additions & 1 deletion libmesabox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ loginutils = [
"getty"
]

mount = ["libc", "lazy_static"]
# XXX: temporary until renaming dependencies is supported
tar_util = ["tar", "globset"]
lsb = [
"tar"
"mount", "tar"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please split into multiple lines.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

]

ping = ["chrono", "crossbeam", "libc", "pnet", "byteorder", "trust-dns-resolver", "mio", "socket2"]
Expand Down Expand Up @@ -100,6 +101,7 @@ kernel32-sys = "0.2.2"
winapi = { version = "0.3.5", features = ["namedpipeapi"] }
nix = "0.10.0"

lazy_static = { version = "1.0.1", optional = true }
libc = { version = "0.2.40", optional = true }
platform-info = { version = "0.0.1", optional = true }
uucore = { git = "https://github.com/uutils/coreutils", features = ["encoding", "fs", "mode", "parse_time"], optional = true }
Expand Down
3 changes: 3 additions & 0 deletions libmesabox/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ extern crate fnv;
extern crate globset;
#[cfg(feature = "libc")]
extern crate libc;
#[cfg(feature = "lazy_static")]
#[macro_use]
extern crate lazy_static;
#[cfg(feature = "mio")]
extern crate mio;
#[cfg(feature = "pnet")]
Expand Down
Loading