]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
dracut.sh: remove "_EARLY" from CONFIG_MICROCODE_* checks
authorHarald Hoyer <harald@redhat.com>
Wed, 11 Nov 2015 10:38:56 +0000 (11:38 +0100)
committerHarald Hoyer <harald@redhat.com>
Wed, 11 Nov 2015 10:48:32 +0000 (11:48 +0100)
EARLY is merged in the main driver

dracut.sh

index 2712e9e1b399895e976babff18fe81c2c0fa2e41..9ba481b7f7a7abb80efa4a2c5056257294c72b7f 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -1016,18 +1016,18 @@ fi
 if [[ $early_microcode = yes ]]; then
     if [[ $hostonly ]]; then
         [[ $(get_cpu_vendor) == "AMD" ]] \
-            && ! check_kernel_config CONFIG_MICROCODE_AMD_EARLY \
+            && ! check_kernel_config CONFIG_MICROCODE_AMD \
             && unset early_microcode
         [[ $(get_cpu_vendor) == "Intel" ]] \
-            && ! check_kernel_config CONFIG_MICROCODE_INTEL_EARLY \
+            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
             && unset early_microcode
     else
-        ! check_kernel_config CONFIG_MICROCODE_AMD_EARLY \
-            && ! check_kernel_config CONFIG_MICROCODE_INTEL_EARLY \
+        ! check_kernel_config CONFIG_MICROCODE_AMD \
+            && ! check_kernel_config CONFIG_MICROCODE_INTEL \
             && unset early_microcode
     fi
     [[ $early_microcode != yes ]] \
-        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]_EARLY!=y"
+        && dwarn "Disabling early microcode, because kernel does not support it. CONFIG_MICROCODE_[AMD|INTEL]!=y"
 fi
 
 # Need to be able to have non-root users read stuff (rpcbind etc)