summaryrefslogtreecommitdiff
path: root/src/system
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2024-03-13 00:40:09 +0200
committerzsdc <taras@vyos.io>2024-03-13 00:40:09 +0200
commitf74923202311e853b677e52cd83bae2be9605c26 (patch)
tree81677eaa9f6e6993cb1129fba5a26a68ea83a54f /src/system
parenta4e21377271cfcf6359ed23db8a90129e264ba4d (diff)
downloadvyos-1x-f74923202311e853b677e52cd83bae2be9605c26.tar.gz
vyos-1x-f74923202311e853b677e52cd83bae2be9605c26.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.
Diffstat (limited to 'src/system')
-rw-r--r--src/system/grub_update.py4
1 files changed, 4 insertions, 0 deletions
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)