From 5da736466cdc1b784116d4583b5ab04cbb66a2ca Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Tue, 8 Dec 2020 15:54:05 +0000 Subject: [PATCH] [initcpiocfg] rework is_intel_cpu --- src/modules/initcpiocfg/main.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index f0070c4dd..f1b72a97e 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -127,6 +127,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): encrypt_hook = False openswap_hook = False unencrypted_separate_boot = False + is_cpu_intel = cpu["proc0"]["vendor_id"].lower() == "genuineintel" # It is important that the plymouth hook comes before any encrypt hook if detect_plymouth(): @@ -179,12 +180,13 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): else: hooks.extend(["filesystems"]) - cpu_intel = "genuineintel" - if btrfs and cpu["proc0"]["vendor_id"].lower() != cpu_intel: + if btrfs and not is_cpu_intel: modules.append("crc32c") - elif (btrfs and cpu["proc0"]["vendor_id"].lower() == cpu_intel): + + elif btrfs and is_cpu_intel: modules.append("crc32c-intel") - else: + + elif not btrfs: hooks.append("fsck") write_mkinitcpio_lines(hooks, modules, files, root_mount_point)