Skip to content

Commit 5013d45

Browse files
committed
tree-wide: Use cap-std-ext is_mountpoint() API
I moved it there a while ago, now we can drop the copy of it here. Signed-off-by: Colin Walters <[email protected]>
1 parent c88fcfd commit 5013d45

File tree

4 files changed

+2
-64
lines changed

4 files changed

+2
-64
lines changed

lib/src/install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ pub(crate) async fn install_to_filesystem(
17111711

17121712
tracing::debug!("Root filesystem: {root_path}");
17131713

1714-
if let Some(false) = ostree_ext::mountutil::is_mountpoint(&rootfs_fd, ".")? {
1714+
if let Some(false) = rootfs_fd.is_mountpoint(".")? {
17151715
anyhow::bail!("Not a mountpoint: {root_path}");
17161716
}
17171717
rootfs_fd

ostree-ext/src/commit.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//! <https://github.com/ostreedev/ostree-rs-ext/issues/159>
44
55
use crate::container_utils::require_ostree_container;
6-
use crate::mountutil::is_mountpoint;
76
use anyhow::Context;
87
use anyhow::Result;
98
use cap_std::fs::Dir;
@@ -60,7 +59,7 @@ fn clean_subdir(root: &Dir, rootdev: u64) -> Result<()> {
6059
}
6160
// Also ignore bind mounts, if we have a new enough kernel with statx()
6261
// that will tell us.
63-
if is_mountpoint(root, &path)?.unwrap_or_default() {
62+
if root.is_mountpoint(&path)?.unwrap_or_default() {
6463
tracing::trace!("Skipping mount point {path:?}");
6564
continue;
6665
}

ostree-ext/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ pub mod diff;
3939
pub mod ima;
4040
pub mod keyfileext;
4141
pub(crate) mod logging;
42-
pub mod mountutil;
4342
pub mod ostree_prepareroot;
4443
pub mod refescape;
4544
#[doc(hidden)]

ostree-ext/src/mountutil.rs

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)