From cc8bacf8b4b37196dd07cdf987365872b735e639 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 3 Apr 2014 21:08:03 -0400 Subject: [PATCH] bootloaders: Always write out bootloader config file 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. --- src/libostree/ostree-bootloader-syslinux.c | 13 +++++-------- src/libostree/ostree-bootloader-uboot.c | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/libostree/ostree-bootloader-syslinux.c b/src/libostree/ostree-bootloader-syslinux.c index 1d2febec..43273815 100644 --- a/src/libostree/ostree-bootloader-syslinux.c +++ b/src/libostree/ostree-bootloader-syslinux.c @@ -237,14 +237,11 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader *bootloader, 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), - NULL, FALSE, G_FILE_CREATE_NONE, - NULL, cancellable, error)) - goto out; - } + if (!g_file_replace_contents (new_config_path, new_config_contents, + strlen (new_config_contents), + NULL, FALSE, G_FILE_CREATE_NONE, + NULL, cancellable, error)) + goto out; ret = TRUE; out: diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c index 91d051c4..c56d5ac0 100644 --- a/src/libostree/ostree-bootloader-uboot.c +++ b/src/libostree/ostree-bootloader-uboot.c @@ -125,14 +125,11 @@ _ostree_bootloader_uboot_write_config (OstreeBootloader *bootloader, 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), - NULL, FALSE, G_FILE_CREATE_NONE, - NULL, cancellable, error)) - return FALSE; - } + if (!g_file_replace_contents (new_config_path, new_config_contents, + strlen (new_config_contents), + NULL, FALSE, G_FILE_CREATE_NONE, + NULL, cancellable, error)) + return FALSE; return TRUE; }