chore: fmt
This commit is contained in:
@@ -1,8 +1,5 @@
|
|||||||
use crate::module::{handle_updated_modules, prune_modules};
|
use crate::module::{handle_updated_modules, prune_modules};
|
||||||
use crate::{
|
use crate::{assets, defs, ksucalls, restorecon, utils};
|
||||||
assets, defs, ksucalls, restorecon,
|
|
||||||
utils::self,
|
|
||||||
};
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use log::{info, warn};
|
use log::{info, warn};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|||||||
@@ -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::magic_mount::NodeFileType::{Directory, RegularFile, Symlink};
|
||||||
use crate::restorecon::{lgetfilecon, lsetfilecon};
|
use crate::restorecon::{lgetfilecon, lsetfilecon};
|
||||||
use anyhow::{bail, Context, Result};
|
use anyhow::{bail, Context, Result};
|
||||||
|
use extattr::lgetxattr;
|
||||||
use rustix::fs::{
|
use rustix::fs::{
|
||||||
bind_mount, chmod, chown, mount, move_mount, unmount, Gid, MetadataExt, Mode, MountFlags,
|
bind_mount, chmod, chown, mount, move_mount, unmount, Gid, MetadataExt, Mode, MountFlags,
|
||||||
MountPropagationFlags, Uid, UnmountFlags,
|
MountPropagationFlags, Uid, UnmountFlags,
|
||||||
@@ -15,7 +16,6 @@ use std::fs;
|
|||||||
use std::fs::{create_dir, create_dir_all, read_dir, DirEntry, FileType};
|
use std::fs::{create_dir, create_dir_all, read_dir, DirEntry, FileType};
|
||||||
use std::os::unix::fs::symlink;
|
use std::os::unix::fs::symlink;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use extattr::lgetxattr;
|
|
||||||
|
|
||||||
const REPLACE_DIR_XATTR: &str = "trusted.overlay.opaque";
|
const REPLACE_DIR_XATTR: &str = "trusted.overlay.opaque";
|
||||||
|
|
||||||
@@ -121,7 +121,8 @@ fn collect_module_files() -> Result<Option<Node>> {
|
|||||||
continue;
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ use std::{
|
|||||||
fs::{File, Permissions, remove_dir_all, remove_file, set_permissions},
|
fs::{File, Permissions, remove_dir_all, remove_file, set_permissions},
|
||||||
io::Cursor,
|
io::Cursor,
|
||||||
path::{Path, PathBuf},
|
path::{Path, PathBuf},
|
||||||
process::{Command},
|
process::Command,
|
||||||
str::FromStr,
|
str::FromStr,
|
||||||
};
|
};
|
||||||
use zip_extensions::zip_extract_file_to_memory;
|
use zip_extensions::zip_extract_file_to_memory;
|
||||||
|
|||||||
Reference in New Issue
Block a user