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

Fix wrong minor ABI version in sysmerge(8) ABI transition notice.

This commit is contained in:
Jonas 'Sortie' Termansen 2022-01-12 21:17:28 +01:00
parent 4e86394e3d
commit 31e3a20bca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysinstall/sysmerge.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, 2018, 2020, 2021 Jonas 'Sortie' Termansen. * Copyright (c) 2016, 2018, 2020, 2021, 2022 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -287,9 +287,9 @@ int main(int argc, char* argv[])
if ( !wait && !can_run_new_abi ) if ( !wait && !can_run_new_abi )
{ {
printf("%lu.%lu -> %lu.%lu ABI transition, " printf("%lu.%lu -> %lu.%lu ABI transition, "
"delaying upgrade to next boot.\n", "delaying upgrade to next boot.\n",
old_release.abi_major, old_release.abi_major, old_release.abi_major, old_release.abi_minor,
new_release.abi_major, new_release.abi_major); new_release.abi_major, new_release.abi_minor);
wait = true; wait = true;
} }
header = true; header = true;
@ -337,7 +337,7 @@ int main(int argc, char* argv[])
if ( mkdir(target, 0755) < 0 ) if ( mkdir(target, 0755) < 0 )
err(2, "%s", target); err(2, "%s", target);
execute((const char*[]) { "tix-collection", "/sysmerge", "create", execute((const char*[]) { "tix-collection", "/sysmerge", "create",
NULL }, "e"); NULL }, "e");
} }
install_manifests_detect(source, target, true, true, full); install_manifests_detect(source, target, true, true, full);
} }