diff --git a/userspace/ksud_magic/src/init_event.rs b/userspace/ksud_magic/src/init_event.rs index 931401ae..dcd27fab 100644 --- a/userspace/ksud_magic/src/init_event.rs +++ b/userspace/ksud_magic/src/init_event.rs @@ -3,7 +3,7 @@ use crate::module::{handle_updated_modules, prune_modules}; use crate::{assets, defs, ksucalls, restorecon, utils}; use anyhow::{Context, Result}; use log::{info, warn}; -use rustix::fs::{mount, MountFlags}; +use rustix::fs::{MountFlags, mount}; use std::path::Path; pub fn on_post_data_fs() -> Result<()> { diff --git a/userspace/ksud_magic/src/magic_mount.rs b/userspace/ksud_magic/src/magic_mount.rs index 9fd4d816..5a36dd7a 100644 --- a/userspace/ksud_magic/src/magic_mount.rs +++ b/userspace/ksud_magic/src/magic_mount.rs @@ -7,17 +7,17 @@ use crate::utils::{ensure_dir_exists, get_work_dir}; use anyhow::{Context, Result, bail}; use extattr::lgetxattr; use rustix::fs::{ - bind_mount, chmod, chown, mount, move_mount, unmount, Gid, MetadataExt, Mode, MountFlags, - MountPropagationFlags, Uid, UnmountFlags, + Gid, MetadataExt, Mode, MountFlags, MountPropagationFlags, Uid, UnmountFlags, bind_mount, + chmod, chown, mount, move_mount, unmount, }; use rustix::mount::mount_change; use rustix::path::Arg; use std::cmp::PartialEq; -use std::collections::hash_map::Entry; use std::collections::HashMap; +use std::collections::hash_map::Entry; use std::fs; -use std::fs::{create_dir, create_dir_all, read_dir, read_link, DirEntry, FileType}; -use std::os::unix::fs::{symlink, FileTypeExt}; +use std::fs::{DirEntry, FileType, create_dir, create_dir_all, read_dir, read_link}; +use std::os::unix::fs::{FileTypeExt, symlink}; use std::path::{Path, PathBuf}; const REPLACE_DIR_XATTR: &str = "trusted.overlay.opaque";