Procházet zdrojové kódy

ci: disable SUSFS OPEN_REDIRECT when NoMount is integrated

TheWildJames před 3 týdny
rodič
revize
6630f1bb95

+ 20 - 2
.github/actions/susfs-config/action.yml

@@ -1,10 +1,15 @@
 name: 'Enable SUSFS Kernel Configs'
 description: 'Enable SUSFS-related kernel configuration options'
+inputs:
+  nomount_enabled:
+    description: 'Set true when NoMount is integrated (disables SUSFS OPEN_REDIRECT to avoid overlapping hook overhead)'
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
   steps:
-    - name: Enable Kernel Configs
+    - name: Enable SUSFS Kernel Configs
       uses: ./.github/actions/set-kernel-config
       with:
         config_list: |
@@ -16,5 +21,18 @@ runs:
           CONFIG_KSU_SUSFS_ENABLE_LOG=y
           CONFIG_KSU_SUSFS_HIDE_KSU_SUSFS_SYMBOLS=y
           CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y
-          CONFIG_KSU_SUSFS_OPEN_REDIRECT=y
           CONFIG_KSU_SUSFS_SUS_MAP=y
+
+    - name: Enable SUSFS Open Redirect (no NoMount)
+      if: ${{ inputs.nomount_enabled != 'true' }}
+      uses: ./.github/actions/set-kernel-config
+      with:
+        config_list: |
+          CONFIG_KSU_SUSFS_OPEN_REDIRECT=y
+
+    - name: Disable SUSFS Open Redirect (NoMount integrated)
+      if: ${{ inputs.nomount_enabled == 'true' }}
+      uses: ./.github/actions/set-kernel-config
+      with:
+        config_list: |
+          CONFIG_KSU_SUSFS_OPEN_REDIRECT=n

+ 6 - 0
.github/actions/susfs/action.yml

@@ -24,6 +24,10 @@ inputs:
     description: 'Selected root implementation (classic / next / resukisu). Classic KernelSU (tiann main) needs the 10_enable_susfs_for_ksu patch; other flavors already ship SUSFS.'
     required: false
     default: ""
+  nomount_enabled:
+    description: 'Set true when NoMount is integrated (disables SUSFS OPEN_REDIRECT to avoid overlapping hook overhead)'
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
@@ -54,6 +58,8 @@ runs:
 
     - name: Enable SUSFS Kernel Configs
       uses: ./.github/actions/susfs-config
+      with:
+        nomount_enabled: ${{ inputs.nomount_enabled }}
 
     - name: Apply SUSFS Patches
       uses: ./.github/actions/susfs-patches

+ 1 - 0
.github/workflows/build.yml

@@ -214,6 +214,7 @@ jobs:
         os_patch_level: ${{ inputs.os_patch_level }}
         sublevel: ${{ steps.extract.outputs.sublevel }}
         root_flavor: ${{ inputs.root_flavor }}
+        nomount_enabled: ${{ contains(inputs.feature_set, 'NoMount') }}
 
     - name: Baseband Guard
       if: (contains(inputs.feature_set, 'BBG') || inputs.feature_set == 'All')