diff --git a/userspace/ksud/src/init_event.rs b/userspace/ksud/src/init_event.rs index 02a96bb3..c3327022 100644 --- a/userspace/ksud/src/init_event.rs +++ b/userspace/ksud/src/init_event.rs @@ -1,8 +1,5 @@ use crate::module::{handle_updated_modules, prune_modules}; -use crate::{ - assets, defs, ksucalls, restorecon, - utils::self, -}; +use crate::{assets, defs, ksucalls, restorecon, utils}; use anyhow::{Context, Result}; use log::{info, warn}; use std::path::Path; diff --git a/userspace/ksud/src/magic_mount.rs b/userspace/ksud/src/magic_mount.rs index 2d27ad80..d3ceb033 100644 --- a/userspace/ksud/src/magic_mount.rs +++ b/userspace/ksud/src/magic_mount.rs @@ -2,6 +2,7 @@ use crate::defs::{KSU_MOUNT_SOURCE, MODULE_DIR, SKIP_MOUNT_FILE_NAME, TEMP_DIR}; use crate::magic_mount::NodeFileType::{Directory, RegularFile, Symlink}; use crate::restorecon::{lgetfilecon, lsetfilecon}; use anyhow::{bail, Context, Result}; +use extattr::lgetxattr; use rustix::fs::{ bind_mount, chmod, chown, mount, move_mount, unmount, Gid, MetadataExt, Mode, MountFlags, MountPropagationFlags, Uid, UnmountFlags, @@ -15,7 +16,6 @@ use std::fs; use std::fs::{create_dir, create_dir_all, read_dir, DirEntry, FileType}; use std::os::unix::fs::symlink; use std::path::{Path, PathBuf}; -use extattr::lgetxattr; const REPLACE_DIR_XATTR: &str = "trusted.overlay.opaque"; @@ -121,7 +121,8 @@ fn collect_module_files() -> Result> { continue; } - if entry.path().join("disable").exists() || entry.path().join(SKIP_MOUNT_FILE_NAME).exists() { + if entry.path().join("disable").exists() || entry.path().join(SKIP_MOUNT_FILE_NAME).exists() + { continue; } diff --git a/userspace/ksud/src/module.rs b/userspace/ksud/src/module.rs index 3bd2d819..f3ab6cb0 100644 --- a/userspace/ksud/src/module.rs +++ b/userspace/ksud/src/module.rs @@ -19,7 +19,7 @@ use std::{ fs::{File, Permissions, remove_dir_all, remove_file, set_permissions}, io::Cursor, path::{Path, PathBuf}, - process::{Command}, + process::Command, str::FromStr, }; use zip_extensions::zip_extract_file_to_memory;