nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sysupgrade(8) cancelation of pending sysmerge(8) upgrades.

This commit is contained in:
Jonas 'Sortie' Termansen 2021-01-08 00:57:10 +01:00
parent 4c089a01d6
commit 516c15d69e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysinstall/sysupgrade.c
View File

@ -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;