diff options
| author | zsdc <taras@vyos.io> | 2024-03-13 00:40:09 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-03-13 04:35:22 +0000 |
| commit | 84b520dd580b7725de4c9e62b11ec490cb8d3f4f (patch) | |
| tree | fa6d141ce9e5194b288601d30c3953fb4044951a /src/op_mode | |
| parent | ed3332f9eac3cedcbbaf48095b1ad202a5379267 (diff) | |
| download | vyos-1x-84b520dd580b7725de4c9e62b11ec490cb8d3f4f.tar.gz vyos-1x-84b520dd580b7725de4c9e62b11ec490cb8d3f4f.zip | |
grub: T4548: Fixed configuration files order
To iterate files on ext* file systems GRUB reads their inodes one by one,
ignoring names. This breaks our configuration logic that relies on proper
loading order.
This commit adds a helper `sort_inodes()` that needs to be used whenever GRUB
configuration files are created. It recreates files, changing their inodes in a
way where inodes order matches alphabetical order.
(cherry picked from commit f74923202311e853b677e52cd83bae2be9605c26)
Diffstat (limited to 'src/op_mode')
| -rwxr-xr-x | src/op_mode/image_installer.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py index 886745bc7..5e5b8b275 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -733,6 +733,10 @@ def install_image() -> None: grub.install(install_target.name, f'{DIR_DST_ROOT}/boot/', f'{DIR_DST_ROOT}/boot/efi') + # sort inodes (to make GRUB read config files in alphabetical order) + grub.sort_inodes(f'{DIR_DST_ROOT}/{grub.GRUB_DIR_VYOS}') + grub.sort_inodes(f'{DIR_DST_ROOT}/{grub.GRUB_DIR_VYOS_VERS}') + # umount filesystems and remove temporary files if is_raid_install(install_target): cleanup([install_target.name], |