diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-03-13 11:12:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 11:12:27 +0100 |
| commit | c8528d080786a4be9436fa71c9ec969b9c3719fd (patch) | |
| tree | fa6d141ce9e5194b288601d30c3953fb4044951a /src | |
| parent | ed3332f9eac3cedcbbaf48095b1ad202a5379267 (diff) | |
| parent | 84b520dd580b7725de4c9e62b11ec490cb8d3f4f (diff) | |
| download | vyos-1x-c8528d080786a4be9436fa71c9ec969b9c3719fd.tar.gz vyos-1x-c8528d080786a4be9436fa71c9ec969b9c3719fd.zip | |
Merge pull request #3127 from vyos/mergify/bp/sagitta/pr-3126
grub: T4548: Fixed GRUB configuration files order (backport #3126)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/op_mode/image_installer.py | 4 | ||||
| -rw-r--r-- | src/system/grub_update.py | 4 |
2 files changed, 8 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], diff --git a/src/system/grub_update.py b/src/system/grub_update.py index 5a7d8eb72..5a0534195 100644 --- a/src/system/grub_update.py +++ b/src/system/grub_update.py @@ -105,4 +105,8 @@ if __name__ == '__main__': else: render(grub_cfg_main, grub.TMPL_GRUB_MAIN, {}) + # sort inodes (to make GRUB read config files in alphabetical order) + grub.sort_inodes(f'{root_dir}/{grub.GRUB_DIR_VYOS}') + grub.sort_inodes(f'{root_dir}/{grub.GRUB_DIR_VYOS_VERS}') + exit(0) |