From aa7a00b299eeee88c5726d4bb86893c6356c4091 Mon Sep 17 00:00:00 2001
From: tiann <twsxtd@gmail.com>
Date: Mon, 6 Feb 2023 08:58:02 +0800
Subject: [PATCH] ksud: don't mount module when in safe mode

---
 userspace/ksud/src/event.rs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/userspace/ksud/src/event.rs b/userspace/ksud/src/event.rs
index 4e1cad18..59842446 100644
--- a/userspace/ksud/src/event.rs
+++ b/userspace/ksud/src/event.rs
@@ -132,25 +132,26 @@ pub fn on_post_data_fs() -> Result<()> {
         warn!("load sepolicy.rule failed");
     }
 
+    if crate::utils::is_safe_mode() {
+        warn!("safe mode, skip module post-fs-data scripts");
+        return Ok(());
+    }
+
     // mount systemless overlay
     if let Err(e) = mount_systemlessly(module_dir) {
         warn!("do systemless mount failed: {}", e);
     }
 
     // module mounted, exec modules post-fs-data scripts
-    if crate::utils::is_safe_mode() {
-        warn!("safe mode, skip module post-fs-data scripts");
-    } else {
-        // todo: Add timeout
-        if let Err(e) = crate::module::exec_common_scripts("post-fs-data.d", true) {
-            warn!("exec common post-fs-data scripts failed: {}", e);
-        }
-        if let Err(e) = crate::module::exec_post_fs_data() {
-            warn!("exec post-fs-data scripts failed: {}", e);
-        }
-        if let Err(e) = crate::module::load_system_prop() {
-            warn!("load system.prop failed: {}", e);
-        }
+    // todo: Add timeout
+    if let Err(e) = crate::module::exec_common_scripts("post-fs-data.d", true) {
+        warn!("exec common post-fs-data scripts failed: {}", e);
+    }
+    if let Err(e) = crate::module::exec_post_fs_data() {
+        warn!("exec post-fs-data scripts failed: {}", e);
+    }
+    if let Err(e) = crate::module::load_system_prop() {
+        warn!("load system.prop failed: {}", e);
     }
 
     Ok(())