From 516c15d69ea66098749821e970f2fa9a20751f6b Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Fri, 8 Jan 2021 00:57:10 +0100
Subject: [PATCH] Fix sysupgrade(8) cancelation of pending sysmerge(8)
 upgrades.

---
 sysinstall/sysupgrade.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sysinstall/sysupgrade.c b/sysinstall/sysupgrade.c
index d75b8e92..0d036f24 100644
--- a/sysinstall/sysupgrade.c
+++ b/sysinstall/sysupgrade.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Jonas 'Sortie' Termansen.
+ * Copyright (c) 2015, 2016, 2021 Jonas 'Sortie' Termansen.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -709,7 +709,8 @@ int main(void)
 		if ( !strcasecmp(input, "no") )
 			errx(2, "Upgrade aborted due to pending sysmerge(8) upgrade");
 		text("\n");
-		execute((const char*[]) { "chroot", "-d", "sysmerge", "--cancel", NULL }, "e");
+		execute((const char*[]) { "chroot", "-d", ".", "sysmerge", "--cancel",
+		                          NULL }, "e");
 	}
 
 	bool do_upgrade_bootloader;