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

ksud: don't umount stock overlayfs, just remount it

Browse Source
This commit is contained in:
tiann
2023-04-11 16:24:02 +08:00
parent d065a7ca22
commit 5f04954a5c
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,9 +185,8 @@ pub fn on_post_data_fs() -> Result<()> {
} }
// Finally, we should do systemless mount // Finally, we should do systemless mount
// But we should umount all stock overlayfs and remount them after module mounted // But we should backup all stock overlayfs and remount them after module mounted
let stock_overlay = mount::StockOverlay::new(); let stock_overlay = mount::StockOverlay::new();
stock_overlay.umount_all();
// mount moduke systemlessly by overlay // mount moduke systemlessly by overlay
if let Err(e) = mount_systemlessly(module_dir) { if let Err(e) = mount_systemlessly(module_dir) {

16
userspace/ksud/src/mount.rs
View File

@@ -168,9 +168,6 @@ impl StockOverlay {
unimplemented!() unimplemented!()
} }
pub fn umount_all(&self) {
unimplemented!()
}
} }
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
@@ -238,19 +235,6 @@ impl StockOverlay {
} }
} }
} }
pub fn umount_all(&self) {
log::info!("stock overlay: umount all: {:?}", self.mountinfos);
for mnt in &self.mountinfos {
let Some(p) = mnt.mount_point.to_str() else {
log::warn!("Failed to umount: {}", mnt.mount_point.display());
continue;
};
let result = umount_dir(p);
log::info!("stock umount {}: {:?}", p, result);
}
}
} }
// some ROMs mount device(ext4,exfat) to /vendor, when we do overlay mount, it will overlay // some ROMs mount device(ext4,exfat) to /vendor, when we do overlay mount, it will overlay