Merge pull request #612 from yast/sw_30

add rd.zdev to allowed kernel options on s390 (bsc#1168036)
yast · Jul 23, 2020 · 58e9743 · 58e9743
2 parents 0fd64ed + 16817dd
commit 58e9743
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 23 10:54:47 UTC 2020 - Steffen Winterfeldt <snwint@suse.com>
+
+- add rd.zdev to allowed kernel options on s390 (bsc#1168036)
+- 4.3.7
+
 -------------------------------------------------------------------
 Thu Jun 18 08:37:58 UTC 2020 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        4.3.6
+Version:        4.3.7
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/modules/BootArch.rb b/src/modules/BootArch.rb
@@ -40,7 +40,8 @@ def main
     S390_WHITELIST = [
       /net\.ifnames=\S*/,
       /fips=\S*/,
-      /mitigations=\S*/
+      /mitigations=\S*/,
+      /rd\.zdev=\S*/
     ].freeze
 
     # Get parameters for the default kernel