You've already forked KernelSU-Next
mirror of
https://github.com/KernelSU-Next/KernelSU-Next.git
synced 2025-08-27 23:46:34 +00:00
manager: clean lkm remnants
ksud: clean clippy warnings
This commit is contained in:
18
.github/workflows/ksud.yml
vendored
18
.github/workflows/ksud.yml
vendored
@@ -9,10 +9,10 @@ on:
|
||||
required: false
|
||||
type: string
|
||||
default: ubuntu-latest
|
||||
pack_lkm:
|
||||
required: false
|
||||
type: boolean
|
||||
default: true
|
||||
# pack_lkm:
|
||||
# required: false
|
||||
# type: boolean
|
||||
# default: true
|
||||
use_cache:
|
||||
required: false
|
||||
type: boolean
|
||||
@@ -29,11 +29,11 @@ jobs:
|
||||
- name: Download Artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
|
||||
- name: Prepare LKM Files
|
||||
if: ${{ inputs.pack_lkm }}
|
||||
run: |
|
||||
cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/
|
||||
cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/
|
||||
# - name: Prepare LKM Files
|
||||
# if: ${{ inputs.pack_lkm }}
|
||||
# run: |
|
||||
# cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/
|
||||
# cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/ // DISBAND LKM MODE
|
||||
|
||||
- name: Import susfsd Libraries
|
||||
run: |
|
||||
|
||||
@@ -378,12 +378,12 @@ fun SettingScreen(navigator: DestinationsNavigator) {
|
||||
)
|
||||
}
|
||||
|
||||
val lkmMode = Natives.version >= Natives.MINIMAL_SUPPORTED_KERNEL_LKM && Natives.isLkmMode
|
||||
if (lkmMode) {
|
||||
UninstallItem(navigator) {
|
||||
loadingDialog.withLoading(it)
|
||||
}
|
||||
}
|
||||
// val lkmMode = Natives.version >= Natives.MINIMAL_SUPPORTED_KERNEL_LKM && Natives.isLkmMode
|
||||
// if (lkmMode) {
|
||||
// UninstallItem(navigator) {
|
||||
// loadingDialog.withLoading(it)
|
||||
// }
|
||||
// } // DISBAND LKM MODE
|
||||
|
||||
var showBottomsheet by remember { mutableStateOf(false) }
|
||||
|
||||
@@ -511,107 +511,107 @@ fun SettingScreen(navigator: DestinationsNavigator) {
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun UninstallItem(
|
||||
navigator: DestinationsNavigator,
|
||||
withLoading: suspend (suspend () -> Unit) -> Unit,
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val scope = rememberCoroutineScope()
|
||||
val uninstallConfirmDialog = rememberConfirmDialog()
|
||||
val showTodo = {
|
||||
Toast.makeText(context, "TODO", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
val uninstallDialog = rememberUninstallDialog { uninstallType ->
|
||||
scope.launch {
|
||||
val result = uninstallConfirmDialog.awaitConfirm(
|
||||
title = context.getString(uninstallType.title),
|
||||
content = context.getString(uninstallType.message)
|
||||
)
|
||||
if (result == ConfirmResult.Confirmed) {
|
||||
withLoading {
|
||||
when (uninstallType) {
|
||||
UninstallType.TEMPORARY -> showTodo()
|
||||
UninstallType.PERMANENT -> navigator.navigate(
|
||||
FlashScreenDestination(FlashIt.FlashUninstall)
|
||||
)
|
||||
UninstallType.RESTORE_STOCK_IMAGE -> navigator.navigate(
|
||||
FlashScreenDestination(FlashIt.FlashRestore)
|
||||
)
|
||||
UninstallType.NONE -> Unit
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
val uninstall = stringResource(id = R.string.settings_uninstall)
|
||||
ListItem(
|
||||
leadingContent = {
|
||||
Icon(
|
||||
Icons.Filled.Delete,
|
||||
uninstall
|
||||
)
|
||||
},
|
||||
headlineContent = { Text(uninstall) },
|
||||
modifier = Modifier.clickable {
|
||||
uninstallDialog.show()
|
||||
}
|
||||
)
|
||||
}
|
||||
// @Composable
|
||||
// fun UninstallItem(
|
||||
// navigator: DestinationsNavigator,
|
||||
// withLoading: suspend (suspend () -> Unit) -> Unit,
|
||||
// ) {
|
||||
// val context = LocalContext.current
|
||||
// val scope = rememberCoroutineScope()
|
||||
// val uninstallConfirmDialog = rememberConfirmDialog()
|
||||
// val showTodo = {
|
||||
// Toast.makeText(context, "TODO", Toast.LENGTH_SHORT).show()
|
||||
// }
|
||||
// val uninstallDialog = rememberUninstallDialog { uninstallType ->
|
||||
// scope.launch {
|
||||
// val result = uninstallConfirmDialog.awaitConfirm(
|
||||
// title = context.getString(uninstallType.title),
|
||||
// content = context.getString(uninstallType.message)
|
||||
// )
|
||||
// if (result == ConfirmResult.Confirmed) {
|
||||
// withLoading {
|
||||
// when (uninstallType) {
|
||||
// UninstallType.TEMPORARY -> showTodo()
|
||||
// UninstallType.PERMANENT -> navigator.navigate(
|
||||
// FlashScreenDestination(FlashIt.FlashUninstall)
|
||||
// )
|
||||
// UninstallType.RESTORE_STOCK_IMAGE -> navigator.navigate(
|
||||
// FlashScreenDestination(FlashIt.FlashRestore)
|
||||
// )
|
||||
// UninstallType.NONE -> Unit
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// val uninstall = stringResource(id = R.string.settings_uninstall)
|
||||
// ListItem(
|
||||
// leadingContent = {
|
||||
// Icon(
|
||||
// Icons.Filled.Delete,
|
||||
// uninstall
|
||||
// )
|
||||
// },
|
||||
// headlineContent = { Text(uninstall) },
|
||||
// modifier = Modifier.clickable {
|
||||
// uninstallDialog.show()
|
||||
// }
|
||||
// )
|
||||
// }
|
||||
|
||||
enum class UninstallType(val title: Int, val message: Int, val icon: ImageVector) {
|
||||
TEMPORARY(
|
||||
R.string.settings_uninstall_temporary,
|
||||
R.string.settings_uninstall_temporary_message,
|
||||
Icons.Filled.Delete
|
||||
),
|
||||
PERMANENT(
|
||||
R.string.settings_uninstall_permanent,
|
||||
R.string.settings_uninstall_permanent_message,
|
||||
Icons.Filled.DeleteForever
|
||||
),
|
||||
RESTORE_STOCK_IMAGE(
|
||||
R.string.settings_restore_stock_image,
|
||||
R.string.settings_restore_stock_image_message,
|
||||
Icons.AutoMirrored.Filled.Undo
|
||||
),
|
||||
NONE(0, 0, Icons.Filled.Delete)
|
||||
}
|
||||
// enum class UninstallType(val title: Int, val message: Int, val icon: ImageVector) {
|
||||
// TEMPORARY(
|
||||
// R.string.settings_uninstall_temporary,
|
||||
// R.string.settings_uninstall_temporary_message,
|
||||
// Icons.Filled.Delete
|
||||
// ),
|
||||
// PERMANENT(
|
||||
// R.string.settings_uninstall_permanent,
|
||||
// R.string.settings_uninstall_permanent_message,
|
||||
// Icons.Filled.DeleteForever
|
||||
// ),
|
||||
// RESTORE_STOCK_IMAGE(
|
||||
// R.string.settings_restore_stock_image,
|
||||
// R.string.settings_restore_stock_image_message,
|
||||
// Icons.AutoMirrored.Filled.Undo
|
||||
// ),
|
||||
// NONE(0, 0, Icons.Filled.Delete)
|
||||
// }
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun rememberUninstallDialog(onSelected: (UninstallType) -> Unit): DialogHandle {
|
||||
return rememberCustomDialog { dismiss ->
|
||||
val options = listOf(
|
||||
// UninstallType.TEMPORARY,
|
||||
UninstallType.PERMANENT,
|
||||
UninstallType.RESTORE_STOCK_IMAGE
|
||||
)
|
||||
val listOptions = options.map {
|
||||
ListOption(
|
||||
titleText = stringResource(it.title),
|
||||
subtitleText = if (it.message != 0) stringResource(it.message) else null,
|
||||
icon = IconSource(it.icon)
|
||||
)
|
||||
}
|
||||
// @OptIn(ExperimentalMaterial3Api::class)
|
||||
// @Composable
|
||||
// fun rememberUninstallDialog(onSelected: (UninstallType) -> Unit): DialogHandle {
|
||||
// return rememberCustomDialog { dismiss ->
|
||||
// val options = listOf(
|
||||
// // UninstallType.TEMPORARY,
|
||||
// UninstallType.PERMANENT,
|
||||
// UninstallType.RESTORE_STOCK_IMAGE
|
||||
// )
|
||||
// val listOptions = options.map {
|
||||
// ListOption(
|
||||
// titleText = stringResource(it.title),
|
||||
// subtitleText = if (it.message != 0) stringResource(it.message) else null,
|
||||
// icon = IconSource(it.icon)
|
||||
// )
|
||||
// }
|
||||
|
||||
var selection = UninstallType.NONE
|
||||
ListDialog(state = rememberUseCaseState(visible = true, onFinishedRequest = {
|
||||
if (selection != UninstallType.NONE) {
|
||||
onSelected(selection)
|
||||
}
|
||||
}, onCloseRequest = {
|
||||
dismiss()
|
||||
}), header = Header.Default(
|
||||
title = stringResource(R.string.settings_uninstall),
|
||||
), selection = ListSelection.Single(
|
||||
showRadioButtons = false,
|
||||
options = listOptions,
|
||||
) { index, _ ->
|
||||
selection = options[index]
|
||||
})
|
||||
}
|
||||
}
|
||||
// var selection = UninstallType.NONE
|
||||
// ListDialog(state = rememberUseCaseState(visible = true, onFinishedRequest = {
|
||||
// if (selection != UninstallType.NONE) {
|
||||
// onSelected(selection)
|
||||
// }
|
||||
// }, onCloseRequest = {
|
||||
// dismiss()
|
||||
// }), header = Header.Default(
|
||||
// title = stringResource(R.string.settings_uninstall),
|
||||
// ), selection = ListSelection.Single(
|
||||
// showRadioButtons = false,
|
||||
// options = listOptions,
|
||||
// ) { index, _ ->
|
||||
// selection = options[index]
|
||||
// })
|
||||
// }
|
||||
// } // DISBAND LKM MODE
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
|
||||
@@ -7,6 +7,7 @@ use crate::{defs::BINARY_DIR, utils};
|
||||
|
||||
pub const RESETPROP_PATH: &str = concatcp!(BINARY_DIR, "resetprop");
|
||||
pub const BUSYBOX_PATH: &str = concatcp!(BINARY_DIR, "busybox");
|
||||
#[allow(dead_code)]
|
||||
pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl");
|
||||
|
||||
#[allow(dead_code)]
|
||||
|
||||
@@ -19,6 +19,7 @@ use crate::defs::{KSU_BACKUP_DIR, KSU_BACKUP_FILE_PREFIX};
|
||||
use crate::{assets, utils};
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn ensure_gki_kernel() -> Result<()> {
|
||||
let version = get_kernel_version()?;
|
||||
let is_gki = version.0 == 5 && version.1 >= 10 || version.2 > 5;
|
||||
@@ -27,6 +28,7 @@ fn ensure_gki_kernel() -> Result<()> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
pub fn get_kernel_version() -> Result<(i32, i32, i32)> {
|
||||
let uname = rustix::system::uname();
|
||||
let version = uname.release().to_string_lossy();
|
||||
@@ -51,6 +53,7 @@ pub fn get_kernel_version() -> Result<(i32, i32, i32)> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi(version: &str) -> Result<String> {
|
||||
let re = Regex::new(r"(.* )?(\d+\.\d+)(\S+)?(android\d+)(.*)")?;
|
||||
let cap = re
|
||||
@@ -62,6 +65,7 @@ fn parse_kmi(version: &str) -> Result<String> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_uname() -> Result<String> {
|
||||
let uname = rustix::system::uname();
|
||||
let version = uname.release().to_string_lossy();
|
||||
@@ -69,6 +73,7 @@ fn parse_kmi_from_uname() -> Result<String> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_modules() -> Result<String> {
|
||||
use std::io::BufRead;
|
||||
// find a *.ko in /vendor/lib/modules
|
||||
@@ -87,15 +92,18 @@ fn parse_kmi_from_modules() -> Result<String> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
pub fn get_current_kmi() -> Result<String> {
|
||||
parse_kmi_from_uname().or_else(|_| parse_kmi_from_modules())
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
#[allow(dead_code)]
|
||||
pub fn get_current_kmi() -> Result<String> {
|
||||
bail!("Unsupported platform")
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_kernel(kernel: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
use std::fs::{File, copy};
|
||||
use std::io::{BufReader, Read};
|
||||
@@ -129,6 +137,7 @@ fn parse_kmi_from_kernel(kernel: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
bail!("Try to choose LKM manually")
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_boot(magiskboot: &Path, image: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
let image_path = workdir.join("image");
|
||||
|
||||
@@ -153,6 +162,7 @@ fn parse_kmi_from_boot(magiskboot: &Path, image: &PathBuf, workdir: &Path) -> Re
|
||||
parse_kmi_from_kernel(&image_path, workdir)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn do_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -167,6 +177,7 @@ fn do_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -179,6 +190,7 @@ fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
Ok(status.code() == Some(1))
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -190,6 +202,7 @@ fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
Ok(status.success())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn dd<P: AsRef<Path>, Q: AsRef<Path>>(ifile: P, ofile: Q) -> Result<()> {
|
||||
let status = Command::new("dd")
|
||||
.stdout(Stdio::null())
|
||||
@@ -206,6 +219,7 @@ fn dd<P: AsRef<Path>, Q: AsRef<Path>>(ifile: P, ofile: Q) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn restore(
|
||||
image: Option<PathBuf>,
|
||||
magiskboot_path: Option<PathBuf>,
|
||||
@@ -323,6 +337,7 @@ pub fn restore(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn patch(
|
||||
image: Option<PathBuf>,
|
||||
@@ -342,6 +357,7 @@ pub fn patch(
|
||||
result
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn do_patch(
|
||||
image: Option<PathBuf>,
|
||||
@@ -528,6 +544,7 @@ fn do_patch(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[cfg(target_os = "android")]
|
||||
fn calculate_sha1(file_path: impl AsRef<Path>) -> Result<String> {
|
||||
use sha1::Digest;
|
||||
@@ -548,6 +565,7 @@ fn calculate_sha1(file_path: impl AsRef<Path>) -> Result<String> {
|
||||
Ok(format!("{:x}", result))
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[cfg(target_os = "android")]
|
||||
fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
|
||||
let sha1 = calculate_sha1(image)?;
|
||||
@@ -568,6 +586,7 @@ fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[cfg(target_os = "android")]
|
||||
fn clean_backup(sha1: &str) -> Result<()> {
|
||||
println!("- Clean up backup");
|
||||
@@ -591,6 +610,7 @@ fn clean_backup(sha1: &str) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn flash_boot(bootdevice: &Option<String>, new_boot: PathBuf) -> Result<()> {
|
||||
let Some(bootdevice) = bootdevice else {
|
||||
bail!("boot device not found")
|
||||
@@ -604,6 +624,7 @@ fn flash_boot(bootdevice: &Option<String>, new_boot: PathBuf) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn find_magiskboot(magiskboot_path: Option<PathBuf>, workdir: &Path) -> Result<PathBuf> {
|
||||
let magiskboot = {
|
||||
if which("magiskboot").is_ok() {
|
||||
@@ -628,6 +649,7 @@ fn find_magiskboot(magiskboot_path: Option<PathBuf>, workdir: &Path) -> Result<P
|
||||
Ok(magiskboot)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn find_boot_image(
|
||||
image: &Option<PathBuf>,
|
||||
skip_init: bool,
|
||||
|
||||
@@ -38,11 +38,11 @@ enum Commands {
|
||||
/// Trigger `boot-complete` event
|
||||
BootCompleted,
|
||||
|
||||
// /// Install KernelSU Next userspace component to system
|
||||
// Install {
|
||||
// #[arg(long, default_value = None)]
|
||||
// magiskboot: Option<PathBuf>,
|
||||
// }, // DISBAND LKM MODE
|
||||
/// Install KernelSU Next userspace component to system
|
||||
Install {
|
||||
#[arg(long, default_value = None)]
|
||||
magiskboot: Option<PathBuf>,
|
||||
},
|
||||
|
||||
/// Uninstall KernelSU Next modules and itself(LKM Only)
|
||||
Uninstall {
|
||||
@@ -320,7 +320,7 @@ pub fn run() -> Result<()> {
|
||||
Module::List => module::list_modules(),
|
||||
}
|
||||
}
|
||||
// Commands::Install { magiskboot } => utils::install(magiskboot), // DISBAND LKM MODE
|
||||
Commands::Install { magiskboot } => utils::install(magiskboot),
|
||||
Commands::Uninstall { magiskboot } => utils::uninstall(magiskboot),
|
||||
Commands::Sepolicy { command } => match command {
|
||||
Sepolicy::Patch { sepolicy } => crate::sepolicy::live_patch(&sepolicy),
|
||||
|
||||
@@ -7,6 +7,8 @@ use crate::{defs::BINARY_DIR, utils};
|
||||
|
||||
pub const RESETPROP_PATH: &str = concatcp!(BINARY_DIR, "resetprop");
|
||||
pub const BUSYBOX_PATH: &str = concatcp!(BINARY_DIR, "busybox");
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub const BOOTCTL_PATH: &str = concatcp!(BINARY_DIR, "bootctl");
|
||||
|
||||
#[allow(dead_code)]
|
||||
|
||||
@@ -19,6 +19,7 @@ use crate::defs::{KSU_BACKUP_DIR, KSU_BACKUP_FILE_PREFIX};
|
||||
use crate::{assets, utils};
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn ensure_gki_kernel() -> Result<()> {
|
||||
let version = get_kernel_version()?;
|
||||
let is_gki = version.0 == 5 && version.1 >= 10 || version.2 > 5;
|
||||
@@ -27,6 +28,7 @@ fn ensure_gki_kernel() -> Result<()> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
pub fn get_kernel_version() -> Result<(i32, i32, i32)> {
|
||||
let uname = rustix::system::uname();
|
||||
let version = uname.release().to_string_lossy();
|
||||
@@ -92,10 +94,12 @@ pub fn get_current_kmi() -> Result<String> {
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
#[allow(dead_code)]
|
||||
pub fn get_current_kmi() -> Result<String> {
|
||||
bail!("Unsupported platform")
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_kernel(kernel: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
use std::fs::{File, copy};
|
||||
use std::io::{BufReader, Read};
|
||||
@@ -129,6 +133,7 @@ fn parse_kmi_from_kernel(kernel: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
bail!("Try to choose LKM manually")
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn parse_kmi_from_boot(magiskboot: &Path, image: &PathBuf, workdir: &Path) -> Result<String> {
|
||||
let image_path = workdir.join("image");
|
||||
|
||||
@@ -153,6 +158,7 @@ fn parse_kmi_from_boot(magiskboot: &Path, image: &PathBuf, workdir: &Path) -> Re
|
||||
parse_kmi_from_kernel(&image_path, workdir)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn do_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -167,6 +173,7 @@ fn do_cpio_cmd(magiskboot: &Path, workdir: &Path, cmd: &str) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -179,6 +186,7 @@ fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
Ok(status.code() == Some(1))
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
let status = Command::new(magiskboot)
|
||||
.current_dir(workdir)
|
||||
@@ -190,6 +198,7 @@ fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
|
||||
Ok(status.success())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn dd<P: AsRef<Path>, Q: AsRef<Path>>(ifile: P, ofile: Q) -> Result<()> {
|
||||
let status = Command::new("dd")
|
||||
.stdout(Stdio::null())
|
||||
@@ -323,6 +332,7 @@ pub fn restore(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn patch(
|
||||
image: Option<PathBuf>,
|
||||
@@ -342,6 +352,7 @@ pub fn patch(
|
||||
result
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn do_patch(
|
||||
image: Option<PathBuf>,
|
||||
@@ -529,6 +540,7 @@ fn do_patch(
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn calculate_sha1(file_path: impl AsRef<Path>) -> Result<String> {
|
||||
use sha1::Digest;
|
||||
use std::io::Read;
|
||||
@@ -549,6 +561,7 @@ fn calculate_sha1(file_path: impl AsRef<Path>) -> Result<String> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
|
||||
let sha1 = calculate_sha1(image)?;
|
||||
let filename = format!("{KSU_BACKUP_FILE_PREFIX}{sha1}");
|
||||
@@ -569,6 +582,7 @@ fn do_backup(magiskboot: &Path, workdir: &Path, image: &str) -> Result<()> {
|
||||
}
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
#[allow(dead_code)]
|
||||
fn clean_backup(sha1: &str) -> Result<()> {
|
||||
println!("- Clean up backup");
|
||||
let backup_name = format!("{}{}", KSU_BACKUP_FILE_PREFIX, sha1);
|
||||
@@ -591,6 +605,7 @@ fn clean_backup(sha1: &str) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn flash_boot(bootdevice: &Option<String>, new_boot: PathBuf) -> Result<()> {
|
||||
let Some(bootdevice) = bootdevice else {
|
||||
bail!("boot device not found")
|
||||
@@ -604,6 +619,7 @@ fn flash_boot(bootdevice: &Option<String>, new_boot: PathBuf) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn find_magiskboot(magiskboot_path: Option<PathBuf>, workdir: &Path) -> Result<PathBuf> {
|
||||
let magiskboot = {
|
||||
if which("magiskboot").is_ok() {
|
||||
@@ -628,6 +644,7 @@ fn find_magiskboot(magiskboot_path: Option<PathBuf>, workdir: &Path) -> Result<P
|
||||
Ok(magiskboot)
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn find_boot_image(
|
||||
image: &Option<PathBuf>,
|
||||
skip_init: bool,
|
||||
@@ -677,6 +694,7 @@ fn find_boot_image(
|
||||
Ok((bootimage, bootdevice))
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn post_ota() -> Result<()> {
|
||||
use crate::defs::ADB_DIR;
|
||||
use assets::BOOTCTL_PATH;
|
||||
|
||||
@@ -34,11 +34,11 @@ enum Commands {
|
||||
/// Trigger `boot-complete` event
|
||||
BootCompleted,
|
||||
|
||||
// /// Install KernelSU Next userspace component to system
|
||||
// Install {
|
||||
// #[arg(long, default_value = None)]
|
||||
// magiskboot: Option<PathBuf>,
|
||||
// }, // DISBAND LKM MODE
|
||||
/// Install KernelSU Next userspace component to system
|
||||
Install {
|
||||
#[arg(long, default_value = None)]
|
||||
magiskboot: Option<PathBuf>,
|
||||
},
|
||||
|
||||
/// Uninstall KernelSU Next modules and itself(LKM Only)
|
||||
Uninstall {
|
||||
@@ -327,7 +327,7 @@ pub fn run() -> Result<()> {
|
||||
Module::Shrink => module::shrink_ksu_images(),
|
||||
}
|
||||
}
|
||||
// Commands::Install { magiskboot } => utils::install(magiskboot), // DISBAND LKM MODE
|
||||
Commands::Install { magiskboot } => utils::install(magiskboot), // DISBAND LKM MODE
|
||||
Commands::Uninstall { magiskboot } => utils::uninstall(magiskboot),
|
||||
Commands::Sepolicy { command } => match command {
|
||||
Sepolicy::Patch { sepolicy } => crate::sepolicy::live_patch(&sepolicy),
|
||||
|
||||
@@ -12,6 +12,7 @@ pub const PROFILE_TEMPLATE_DIR: &str = concatcp!(PROFILE_DIR, "templates/");
|
||||
pub const KSURC_PATH: &str = concatcp!(WORKING_DIR, ".ksurc");
|
||||
pub const KSU_OVERLAY_SOURCE: &str = "KSU";
|
||||
pub const DAEMON_PATH: &str = concatcp!(ADB_DIR, "ksud");
|
||||
#[allow(dead_code)]
|
||||
pub const MAGISKBOOT_PATH: &str = concatcp!(BINARY_DIR, "magiskboot");
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
|
||||
Reference in New Issue
Block a user