TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 10:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ro.crypto.metadata.enabled

Browse Source
This commit is contained in:
vvb2060 2024-07-18 06:52:41 +08:00 committed by John Wu
parent 0869a90fe3
commit d54baadbed
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
native/src/core/mount.rs
View File

@ -27,7 +27,7 @@ pub fn setup_mounts() {
let dev_path = FsPathBuf::new(&mut dev_buf) let dev_path = FsPathBuf::new(&mut dev_buf)
.join(magisk_tmp) .join(magisk_tmp)
.join(PREINITDEV); .join(PREINITDEV);
let mut mounted = false; let mut linked = false;
if let Ok(attr) = dev_path.get_attr() { if let Ok(attr) = dev_path.get_attr() {
if attr.st.st_mode & libc::S_IFMT as c_uint == libc::S_IFBLK.as_() { if attr.st.st_mode & libc::S_IFMT as c_uint == libc::S_IFBLK.as_() {
// DO NOT mount the block device directly, as we do not know the flags and configs // DO NOT mount the block device directly, as we do not know the flags and configs
@ -59,18 +59,18 @@ pub fn setup_mounts() {
} }
}; };
if r.is_ok() { if r.is_ok() {
mounted = true; linked = true;
break; break;
} }
} }
} }
} }
} }
if !mounted { if !linked {
warn!("mount: preinit mirror not mounted"); warn!("mount: preinit dir not found");
dev_path.remove().ok(); dev_path.remove().ok();
} else { } else {
debug!("mount: preinit mirror mounted"); debug!("mount: preinit dir found");
} }
// Bind remount module root to clear nosuid // Bind remount module root to clear nosuid
@ -153,9 +153,9 @@ enum EncryptType {
pub fn find_preinit_device() -> String { pub fn find_preinit_device() -> String {
let encrypt_type = if get_prop(cstr!("ro.crypto.state"), false) != "encrypted" { let encrypt_type = if get_prop(cstr!("ro.crypto.state"), false) != "encrypted" {
EncryptType::None EncryptType::None
} else if get_prop(cstr!("ro.crypto.type"), false) != "file" { } else if get_prop(cstr!("ro.crypto.type"), false) == "block" {
EncryptType::Block EncryptType::Block
} else if FsPath::from(cstr!("/metadata/vold/metadata_encryption")).exists() { } else if get_prop(cstr!("ro.crypto.metadata.enabled"), false) == "true" {
EncryptType::Metadata EncryptType::Metadata
} else { } else {
EncryptType::File EncryptType::File
@ -227,11 +227,11 @@ pub fn find_preinit_device() -> String {
if mirror_dir.parent(&mut buf) { if mirror_dir.parent(&mut buf) {
FsPath::from(&buf).mkdirs(0o755)?; FsPath::from(&buf).mkdirs(0o755)?;
} }
mirror_dir.remove().ok();
unsafe { unsafe {
libc::umount2(mirror_dir.as_ptr(), libc::MNT_DETACH) libc::umount2(mirror_dir.as_ptr(), libc::MNT_DETACH)
.as_os_err() .as_os_err()
.ok(); // ignore error .ok(); // ignore error
mirror_dir.remove().ok();
libc::symlink(preinit_dir.as_ptr(), mirror_dir.as_ptr()).as_os_err()?; libc::symlink(preinit_dir.as_ptr(), mirror_dir.as_ptr()).as_os_err()?;
} }
}; };