test, sysext: Actually fail the whole operation if sd-merge worker failed

This also fixes a wrong merge failure check.
2024-03-25 08:33:22 +01:00
parent e2bdece284
commit baaa167926
2 changed files with 3 additions and 2 deletions
@@ -1742,9 +1742,10 @@ static int merge(ImageClass image_class,
        r = wait_for_terminate_and_check("(sd-merge)", pid, WAIT_LOG_ABNORMAL);
        if (r < 0)
                return r;
-
        if (r == 123) /* exit code 123 means: didn't do anything */
                return 0;
+        if (r > 0)
+                return log_error_errno(SYNTHETIC_ERRNO(ENXIO), "Failed to merge hierarchies");

        r = need_reload(image_class, hierarchies, no_reload);
        if (r < 0)