Skip to content
Snippets Groups Projects
Commit b15fd534 authored by Philip Müller's avatar Philip Müller
Browse files

[postcfg] remove ucode related code

- with the new microcode hook in mkinitcpio it is partly obsolete
- see also: #88
parent 8bed9a84
Branches 3.2.x-stable
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
# === This file is part of Calamares - <http://github.com/calamares> === # === This file is part of Calamares - <http://github.com/calamares> ===
# #
# Copyright 2014 - 2021, Philip Müller <philm@manjaro.org> # Copyright 2014 - 2024, Philip Müller <philm@manjaro.org>
# Copyright 2016, Artoo <artoo@manjaro.org> # Copyright 2016, Artoo <artoo@manjaro.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
...@@ -100,13 +100,6 @@ class ConfigController: ...@@ -100,13 +100,6 @@ class ConfigController:
if libcalamares.globalstorage.value("hasInternet"): if libcalamares.globalstorage.value("hasInternet"):
target_env_call(["pacman", "-Syy"]) target_env_call(["pacman", "-Syy"])
# Remove unneeded ucode
cpu_ucode = subprocess.getoutput("hwinfo --cpu | grep Vendor: -m1 | cut -d\'\"\' -f2")
if cpu_ucode == "AuthenticAMD":
self.remove_pkg("intel-ucode", "boot/intel-ucode.img")
elif cpu_ucode == "GenuineIntel":
self.remove_pkg("amd-ucode", "boot/amd-ucode.img")
# Remove symlinks before copying # Remove symlinks before copying
self.remove_symlink('root') self.remove_symlink('root')
...@@ -120,10 +113,6 @@ class ConfigController: ...@@ -120,10 +113,6 @@ class ConfigController:
# the target partition. # the target partition.
self.terminate('gpg-agent') self.terminate('gpg-agent')
# Update grub.cfg
if exists(join(self.root, "usr/bin/update-grub")):
target_env_call(["update-grub"])
# Enable 'menu_auto_hide' when supported in grubenv # Enable 'menu_auto_hide' when supported in grubenv
if exists(join(self.root, "usr/bin/grub-set-bootflag")): if exists(join(self.root, "usr/bin/grub-set-bootflag")):
target_env_call(["grub-editenv", "-", "set", "menu_auto_hide=1", "boot_success=1"]) target_env_call(["grub-editenv", "-", "set", "menu_auto_hide=1", "boot_success=1"])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment