diff --git a/sysinstall/sysmerge.c b/sysinstall/sysmerge.c index 3d5d8e3f..cb5a62da 100644 --- a/sysinstall/sysmerge.c +++ b/sysinstall/sysmerge.c @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -156,14 +157,22 @@ int main(int argc, char* argv[]) const char* old_release_path = "/etc/sortix-release"; struct release old_release; if ( !os_release_load(&old_release, old_release_path, old_release_path) ) + { + if ( errno == ENOENT ) + warn("%s", old_release_path); exit(2); + } char* new_release_path; if ( asprintf(&new_release_path, "%s/etc/sortix-release", source) < 0 ) err(2, "asprintf"); struct release new_release; if ( !os_release_load(&new_release, new_release_path, new_release_path) ) + { + if ( errno == ENOENT ) + warn("%s", new_release_path); exit(2); + } free(new_release_path); // TODO: Check if /etc/machine matches the current architecture. diff --git a/sysinstall/sysupgrade.c b/sysinstall/sysupgrade.c index f24521b1..633dd8e8 100644 --- a/sysinstall/sysupgrade.c +++ b/sysinstall/sysupgrade.c @@ -480,7 +480,11 @@ int main(void) struct release new_release; if ( !os_release_load(&new_release, "/etc/sortix-release", "/etc/sortix-release") ) + { + if ( errno == ENOENT ) + warn("/etc/sortix-release"); exit(2); + } char mnt[] = "/tmp/fs.XXXXXX"; if ( !mkdtemp(mnt) )