shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-23 21:35:26 +03:00
Code Issues Projects Releases Wiki Activity

bootloaders: Always write out bootloader config file

Browse Source 
There was an attempted optimization to only write if changed, but this
is broken - we always write the bootloader config into a new
directory.

In theory we should only be writing if it changed, but let's not do a
broken optimization.
This commit is contained in:
Colin Walters 2014-04-03 21:08:03 -04:00
parent ac40de5773
commit cc8bacf8b4
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-bootloader-syslinux.c
View File

@ -237,14 +237,11 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader *bootloader,
new_config_contents = _ostree_sysroot_join_lines (new_lines); new_config_contents = _ostree_sysroot_join_lines (new_lines);
if (strcmp (new_config_contents, config_contents) != 0) if (!g_file_replace_contents (new_config_path, new_config_contents,
{ strlen (new_config_contents),
if (!g_file_replace_contents (new_config_path, new_config_contents, NULL, FALSE, G_FILE_CREATE_NONE,
strlen (new_config_contents), NULL, cancellable, error))
NULL, FALSE, G_FILE_CREATE_NONE, goto out;
NULL, cancellable, error))
goto out;
}
ret = TRUE; ret = TRUE;
out: out:

13
src/libostree/ostree-bootloader-uboot.c
View File

@ -125,14 +125,11 @@ _ostree_bootloader_uboot_write_config (OstreeBootloader *bootloader,
new_config_contents = _ostree_sysroot_join_lines (new_lines); new_config_contents = _ostree_sysroot_join_lines (new_lines);
if (strcmp (new_config_contents, config_contents) != 0) if (!g_file_replace_contents (new_config_path, new_config_contents,
{ strlen (new_config_contents),
if (!g_file_replace_contents (new_config_path, new_config_contents, NULL, FALSE, G_FILE_CREATE_NONE,
strlen (new_config_contents), NULL, cancellable, error))
NULL, FALSE, G_FILE_CREATE_NONE, return FALSE;
NULL, cancellable, error))
return FALSE;
}
return TRUE; return TRUE;
} }