deploy: Remove checksum from generated loader entries

The actual deployment checksum shouldn't be in there, because we may
just swap bootlinks, rendering the name of the old bootloader entry
file invalid.  Thankfully nothing actually parsed the names of these
files, so let's just use the index.
This commit is contained in:
Colin Walters committed 2013-09-19 22:41:33 -04:00
1 parent d03b8bbad9
commit 08b8734576
2 files changed
+10 -11

No files matched your search

+2 -3
View File
@@ -850,10 +850,9 @@ install_deployment_kernel (OstreeSysroot *sysroot,
bootcsumdir = ot_gfile_resolve_path_printf (bootdir, "ostree/%s-%s",
osname,
bootcsum);
bootconfpath = ot_gfile_resolve_path_printf (bootdir, "loader.%d/entries/ostree-%s-%s-%d.conf",
bootconfpath = ot_gfile_resolve_path_printf (bootdir, "loader.%d/entries/ostree-%s-%d.conf",
new_bootversion, osname,
ostree_deployment_get_csum (deployment),
ostree_deployment_get_bootserial (deployment));
ostree_deployment_get_index (deployment));
if (!gs_file_ensure_directory (bootcsumdir, TRUE, cancellable, error))
goto out;