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

ksud: catch dmesg in bootlog

Browse Source
This commit is contained in:
weishu
2024-03-11 14:20:27 +08:00
parent fe7ec370d4
commit d77988c1ac
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
userspace/ksud/src/init_event.rs
View File

@@ -102,7 +102,9 @@ pub fn on_post_data_fs() -> Result<()> {
utils::umask(0); utils::umask(0);
#[cfg(unix)] #[cfg(unix)]
let _ = catch_bootlog(); let _ = catch_bootlog("logcat", vec!["logcat"]);
#[cfg(unix)]
let _ = catch_bootlog("dmesg", vec!["dmesg", "-w"]);
if utils::has_magisk() { if utils::has_magisk() {
warn!("Magisk detected, skip post-fs-data!"); warn!("Magisk detected, skip post-fs-data!");
@@ -265,14 +267,14 @@ pub fn on_boot_completed() -> Result<()> {
} }
#[cfg(unix)] #[cfg(unix)]
fn catch_bootlog() -> Result<()> { fn catch_bootlog(logname: &str, command: Vec<&str>) -> Result<()> {
use std::os::unix::process::CommandExt; use std::os::unix::process::CommandExt;
use std::process::Stdio; use std::process::Stdio;
let logdir = Path::new(defs::LOG_DIR); let logdir = Path::new(defs::LOG_DIR);
utils::ensure_dir_exists(logdir)?; utils::ensure_dir_exists(logdir)?;
let bootlog = logdir.join("boot.log"); let bootlog = logdir.join(format!("{logname}.log"));
let oldbootlog = logdir.join("boot.old.log"); let oldbootlog = logdir.join(format!("{logname}.old.log"));
if bootlog.exists() { if bootlog.exists() {
std::fs::rename(&bootlog, oldbootlog)?; std::fs::rename(&bootlog, oldbootlog)?;
@@ -280,6 +282,8 @@ fn catch_bootlog() -> Result<()> {
let bootlog = std::fs::File::create(bootlog)?; let bootlog = std::fs::File::create(bootlog)?;
let mut args = vec!["-s", "9", "30s"];
args.extend_from_slice(&command);
// timeout -s 9 30s logcat > boot.log // timeout -s 9 30s logcat > boot.log
let result = unsafe { let result = unsafe {
std::process::Command::new("timeout") std::process::Command::new("timeout")
@@ -288,10 +292,7 @@ fn catch_bootlog() -> Result<()> {
utils::switch_cgroups(); utils::switch_cgroups();
Ok(()) Ok(())
}) })
.arg("-s") .args(args)
.arg("9")
.arg("30s")
.arg("logcat")
.stdout(Stdio::from(bootlog)) .stdout(Stdio::from(bootlog))
.spawn() .spawn()
}; };