From: Colin Walters <walters@verbum.org>
Date: Wed, 27 Jan 2016 15:43:57 +0000 (-0500)
Subject: grub2: Don't delete grub2.cfg.old file we just copied
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~55^2~48
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d2322db7a609fb4653ce6bf6c4b96b0c315a5b7;p=ostree.git

grub2: Don't delete grub2.cfg.old file we just copied

The original intention here was that we'd keey around a copy of the
file so that grub2 could eventually learn how to do atomic updates by
checking for a "fully written" marker in the *new* file, and if it
didn't exist, falling back to grub2.cfg.old.

I haven't yet proposed that upstream, but we might as well stop
deleting the file since it's useful as a backup at least.

Reported-by: Gatis Paeglis
---

diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
index 1f899143..42ed5acc 100644
--- a/src/libostree/ostree-bootloader-grub2.c
+++ b/src/libostree/ostree-bootloader-grub2.c
@@ -388,8 +388,6 @@ rm -f ${grub_cfg}.new
       if (!g_file_copy (self->config_path_efi, config_path_efi_old,
                         G_FILE_COPY_OVERWRITE, cancellable, NULL, NULL, error))
         goto out;
-      if (!ot_gfile_ensure_unlinked (config_path_efi_old, cancellable, error))
-        goto out;
 
       /* NOTE: NON-ATOMIC REPLACEMENT; WE can't do anything else on FAT;
        * see https://bugzilla.gnome.org/show_bug.cgi?id=724246