Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mkinitcpio.conf hooks for upstream consistency #2515

Merged
merged 1 commit into from
May 25, 2024

Conversation

AlexpFr
Copy link
Contributor

@AlexpFr AlexpFr commented May 18, 2024

This PR addresses upstream commits:

  1. mkinitcpio.conf: add kms to the default HOOKS array
  2. mkinitcpio.conf: adjust the placement of the modconf hook for consistency

Additionally, it replaces the missing consolefont hook if the keyboard hook is used instead of the sd-vconsole hook.
For more details, see the Arch Wiki: dm-crypt/System configuration - 1.1 mkinitcpio

PR Description:

This PR adjusts the hooks in mkinitcpio.conf to follow the changes in the upstream mkinitcpio repository.
It also add the consolefont hook if udev is used instead of systemd.

  • Old archinstall default hooks list :
base systemd autodetect microcode keyboard sd-vconsole modconf block filesystems fsck
  • Updated archinstall default hooks list :
base systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck

 

  • Add missing consolefont hook :
self._hooks = [hook.replace('systemd', 'udev').replace('sd-vconsole', 'keymap') for hook in self._hooks]

Updated to:

self._hooks = [hook.replace('systemd', 'udev').replace('sd-vconsole', 'keymap consolefont') for hook in self._hooks]

Tests and Checks

  • I have tested the code!

@AlexpFr AlexpFr requested a review from Torxed as a code owner May 18, 2024 22:06
This commit adjusts the hooks in mkinitcpio.conf to follow the changes
in the upstream mkinitcpio repository.
It also add the consolefont hook if udev is used instead of systemd.

Addresses upstream commits:
[mkinitcpio.conf: add kms to the default HOOKS array](https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/b99eb1c0d5704ed0a0d220d0abcbbbeec10a3b76)
[mkinitcpio.conf: adjust the placement of the modconf hook for consistency](https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/0b052b14615fefbb61ee3d813e3acd365332ee35)

Additionally, it replaces the missing `consolefont` hook if the
`keyboard` hook is used instead of the `sd-vconsole` hook.
For more details, see the Arch Wiki:
[dm-crypt/System configuration - 1.1 mkinitcpio](https://wiki.archlinux.org/title/Dm-crypt/System_configuration#mkinitcpio)
@svartkanin
Copy link
Collaborator

Thanks for the updates

@svartkanin svartkanin merged commit 6b48d78 into archlinux:master May 25, 2024
6 checks passed
@AlexpFr AlexpFr deleted the fix_hooks branch May 25, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants