Whitelist s390x cio_ignore kernel argument

yast · Jan 25, 2024 · e4d7b7b · e4d7b7b
1 parent 56475a8
commit e4d7b7b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/modules/BootArch.rb b/src/modules/BootArch.rb
@@ -36,13 +36,17 @@ def main
     end
 
     # list of regexp to match kernel params that should be added
-    # from installation to running kernel on s390 (bsc#1086665)
+    # from installation to running kernel on s390 (bsc#1086665, bsc#1210525)
     S390_WHITELIST = [
       /net\.ifnames=\S*/,
       /fips=\S*/,
       /mitigations=\S*/,
       /rd\.zdev=\S*/,
+<<<<<<< Updated upstream
       /zfcp\.allow_lun_scan=\S*/
+=======
+      /cio_ignore=\S*/
+>>>>>>> Stashed changes
     ].freeze
 
     # Get parameters for the default kernel