From 39a6e6daaf029fb0a083777679a15ea2c18f72de Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb.connolly@linaro.org>
Date: Mon, 24 Mar 2025 23:31:41 +0100
Subject: [PATCH] commit disk before free

When auto-freeing a disk, be sure to commit pending changes first.

fixes setActiveBootslot() since the GPT refactor

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
 gpt-utils.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gpt-utils.c b/gpt-utils.c
index 6f6d3e5..fe678a3 100644
--- a/gpt-utils.c
+++ b/gpt-utils.c
@@ -613,6 +613,11 @@ int gpt_disk_get_disk_info(const char *dev, struct gpt_disk *disk)
 	}
 
 	if (disk->is_initialized == GPT_DISK_INIT_MAGIC) {
+		/* Commit any changes to the disk */
+		if (gpt_disk_commit(disk)) {
+			fprintf(stderr, "Failed to commit disk entry");
+			return -1;
+		}
 		// We already have a valid disk handle. Free it.
 		LOGD("%s: Freeing disk handle for %s... -> %s\n", __func__, disk->devpath, devpath);
 		gpt_disk_free(disk);