diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-03-13 05:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 05:34:12 +0100 |
| commit | f2038cd6f23f0114452688a5b66145c531982249 (patch) | |
| tree | b224959ee3628ff4fc939e3bf550757df24aac9f /src | |
| parent | 46cdd46215844ff99fa50462367d6040d8af10d3 (diff) | |
| parent | f74923202311e853b677e52cd83bae2be9605c26 (diff) | |
| download | vyos-1x-f2038cd6f23f0114452688a5b66145c531982249.tar.gz vyos-1x-f2038cd6f23f0114452688a5b66145c531982249.zip | |
Merge pull request #3126 from zdc/T4548-circinus
grub: T4548: Fixed GRUB configuration files order
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 85ebd19ba..b0567305a 100755 --- a/src/op_mode/image_installer.py +++ b/src/op_mode/image_installer.py @@ -786,6 +786,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) |