Support replace rc scripts in system partition

Author: Howard20181

native/src/init/lib.rs

@@ -92,7 +92,7 @@ pub mod ffi {
         fn mount_overlay(self: &mut MagiskInit, dest: Utf8CStrRef);
         fn handle_sepolicy(self: &mut MagiskInit);
         fn restore_overlay_contexts(self: &MagiskInit);
-        fn load_overlay_rc(self: &mut MagiskInit, overlay: &Utf8CStrRef);
+        fn load_overlay_rc(self: &mut MagiskInit, overlay: &Utf8CStrRef, module_path: &Utf8CStrRef);
         fn handle_modules_rc(self: &mut MagiskInit, root_dir: &Utf8CStrRef);
     }
     unsafe extern "C++" {

native/src/init/rootdir.cpp

@@ -275,7 +275,7 @@ void MagiskInit::patch_ro_root() noexcept {
         close(dest);
     }
 
-    load_overlay_rc(ROOTOVL);
+    load_overlay_rc(ROOTOVL, "");
     if (access(ROOTOVL "/sbin", F_OK) == 0) {
         // Move files in overlay.d/sbin into tmp_dir
         mv_path(ROOTOVL "/sbin", ".");
@@ -318,7 +318,7 @@ void MagiskInit::patch_rw_root() noexcept {
     link_path("/sbin", "/root");
 
     // Handle overlays
-    load_overlay_rc("/overlay.d");
+    load_overlay_rc("/overlay.d", "");
     mv_path("/overlay.d", "/");
     rm_rf("/data/overlay.d");
     rm_rf("/.backup");

native/src/init/rootdir.rs

@@ -66,7 +66,7 @@ impl MagiskInit {
         }
     }
 
-    pub(crate) fn load_overlay_rc(&mut self, overlay: &Utf8CStr) {
+    pub(crate) fn load_overlay_rc(&mut self, overlay: &Utf8CStr, module_path: &Utf8CStr) {
         if let Ok(mut dir) = Directory::open(overlay) {
             let init_rc = cstr::buf::dynamic(256)
                 .join_path(overlay)
@@ -78,24 +78,40 @@ impl MagiskInit {
             loop {
                 match dir.read() {
                     Ok(None) => break,
-                    Ok(Some(e)) if e.is_file() && e.name().ends_with(".rc") => {
-                        let name = e.name();
-                        let mut path = cstr::buf::dynamic(256).join_path("/").join_path(name);
-                        if path.exists() {
-                            debug!("Replace rc script [{}]", name);
-                        } else {
-                            debug!("Found rc script [{}]", name);
-                            path = cstr::buf::dynamic(256).join_path(overlay).join_path(name);
-                            let mut rc_content = String::new();
-                            if let Ok(mut file) = path.open(O_RDONLY | O_CLOEXEC) {
-                                file.read_to_string(&mut rc_content).log_ok();
-                                self.rc_list.push(rc_content);
-                                drop(file);
-                                path.remove().log_ok();
+                    Ok(Some(e)) => {
+                        let recursive = cstr::buf::dynamic(256).join_path(module_path).exists();
+                        if (recursive && e.is_dir()) || e.is_file() {
+                            let buf = &mut cstr::buf::dynamic(256);
+                            e.resolve_path(buf).log_ok();
+                            if e.is_file() && buf.ends_with(".rc") {
+                                let mut path;
+                                if recursive {
+                                    path = cstr::buf::dynamic(256)
+                                        .join_path(buf.replace(module_path.as_str(), ""));
+                                } else {
+                                    path =
+                                        cstr::buf::dynamic(256).join_path("/").join_path(e.name());
+                                }
+                                if path.exists() {
+                                    debug!("Replace rc script [{}] -> [{}]", path, buf);
+                                } else {
+                                    path = cstr::buf::dynamic(256).join_path(buf);
+                                    debug!("Found rc script [{}]", path);
+                                    let mut rc_content = String::new();
+                                    if let Ok(mut file) = path.open(O_RDONLY | O_CLOEXEC) {
+                                        file.read_to_string(&mut rc_content).log_ok();
+                                        self.rc_list.push(rc_content);
+                                        drop(file);
+                                        path.remove().log_ok();
+                                    }
+                                }
+                            } else if e.is_dir() {
+                                self.load_overlay_rc(buf, module_path);
                             }
+                        } else {
+                            continue;
                         }
                     }
-                    Ok(_) => continue,
                     Err(_) => break,
                 }
             }
@@ -108,12 +124,10 @@ impl MagiskInit {
                 match dir.read() {
                     Ok(None) => break,
                     Ok(Some(e)) if e.is_dir() => {
-                        let name = e.name();
-                        let path = cstr::buf::dynamic(256)
-                            .join_path("/data")
-                            .join_path(PREINITMIRR)
-                            .join_path(name);
-                        self.load_overlay_rc(&path);
+                        let buf = &mut cstr::buf::dynamic(256);
+                        e.resolve_path(buf).log_ok();
+                        let path = cstr::buf::dynamic(256).join_path(&mut *buf);
+                        self.load_overlay_rc(&path, buf);
                         let desc_path = cstr::buf::dynamic(256).join_path(root_dir);
                         path.copy_to(&desc_path).log_ok();
                     }

scripts/util_functions.sh

@@ -593,8 +593,10 @@ copy_preinit_files() {
     [ -f "$MODDIR"/remove ] && continue
     [ -f "$MODDIR"/update ] && continue
     find "$MODDIR" -mindepth 1 -type f -name "*.rc" | while read -r file; do
-      mkdir -p "$PREINITDIR/$MODID"
-      cp "$file" "$PREINITDIR/$MODID/"
+      local path="${file%/*}"
+      path="$PREINITDIR/$MODID${path/$MODDIR/}"
+      mkdir -p "$path"
+      cp "$file" "$path/"
     done
   done
 }