android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ksud: fix post-fs-data.sh and service.sh may be not executed

Browse Source
This commit is contained in:
tiann
2023-02-01 20:28:17 +08:00
parent 85bf01eb65
commit d8042a36c3
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
userspace/ksud/src/event.rs
View File

@@ -155,7 +155,9 @@ pub fn on_post_data_fs() -> Result<()> {
pub fn on_services() -> Result<()> { pub fn on_services() -> Result<()> {
// exec modules service.sh scripts // exec modules service.sh scripts
if !crate::utils::is_safe_mode() { if !crate::utils::is_safe_mode() {
let _ = crate::module::exec_services(); if let Err(e) = crate::module::exec_services() {
warn!("exec service scripts failed: {}", e);
}
} else { } else {
warn!("safe mode, skip module service scripts"); warn!("safe mode, skip module service scripts");
} }

10
userspace/ksud/src/module.rs
View File

@@ -9,7 +9,7 @@ use crate::{
use const_format::concatcp; use const_format::concatcp;
use java_properties::PropertiesIter; use java_properties::PropertiesIter;
use log::{info, warn}; use log::{info, warn, debug};
use std::{ use std::{
collections::HashMap, collections::HashMap,
env::var as env_var, env::var as env_var,
@@ -216,10 +216,12 @@ pub fn exec_post_fs_data() -> Result<()> {
let mut command_new; let mut command_new;
let mut command; let mut command;
if is_executable(&post_fs_data) { if !is_executable(&post_fs_data) {
debug!("{} is not executable, use /system/bin/sh!", post_fs_data.display());
command_new = Command::new("sh"); command_new = Command::new("sh");
command = command_new.arg(&post_fs_data); command = command_new.arg(&post_fs_data);
} else { } else {
debug!("{} is executable, exec directly!", post_fs_data.display());
command_new = Command::new(&post_fs_data); command_new = Command::new(&post_fs_data);
command = &mut command_new; command = &mut command_new;
}; };
@@ -267,10 +269,12 @@ pub fn exec_services() -> Result<()> {
let mut command_new; let mut command_new;
let mut command; let mut command;
if is_executable(&service) { if !is_executable(&service) {
debug!("{} is not executable, use /system/bin/sh!", service.display());
command_new = Command::new("sh"); command_new = Command::new("sh");
command = command_new.arg(&service); command = command_new.arg(&service);
} else { } else {
debug!("{} is executable, exec directly!", service.display());
command_new = Command::new(&service); command_new = Command::new(&service);
command = &mut command_new; command = &mut command_new;
}; };