diff --git a/libocispec b/libocispec index 790d7181d..c979bb400 160000 --- a/libocispec +++ b/libocispec @@ -1 +1 @@ -Subproject commit 790d7181d190bcba6b83ad8a25e89e53946308ff +Subproject commit c979bb400f648b51fb7cf31392032a19c91d817a diff --git a/src/create.c b/src/create.c index 9d164734e..732cd6326 100644 --- a/src/create.c +++ b/src/create.c @@ -157,13 +157,10 @@ crun_command_create (struct crun_global_arguments *global_args, int argc, char * ret = init_libcrun_context (&crun_context, argv[first_arg], global_args, err); if (UNLIKELY (ret < 0)) return ret; - - libcrun_error(0, "config path %s\n", config_file); + container = libcrun_container_load_from_file (config_file, err); if (container == NULL) - libcrun_fail_with_error (0, "error loading config.json XX"); - - libcrun_debug ("Using bundle: %s", bundle); + libcrun_fail_with_error (0, "error loading config.json"); crun_context.bundle = bundle; if (getenv ("LISTEN_FDS")) { diff --git a/src/crun.c b/src/crun.c index 5cb5ab1ae..0dd09551f 100644 --- a/src/crun.c +++ b/src/crun.c @@ -264,7 +264,7 @@ print_version (FILE *stream, struct argp_state *state arg_unused) libcrun_handler_manager_print_feature_tags (libcrun_get_handler_manager (), stream); - fprintf (stream, "+ json_t\n"); + fprintf (stream, "+JANSSON\n"); } static error_t diff --git a/src/libcrun/container.c b/src/libcrun/container.c index 8f9fbf553..8099e6e97 100644 --- a/src/libcrun/container.c +++ b/src/libcrun/container.c @@ -570,7 +570,6 @@ libcrun_container_load_from_file (const char *path, libcrun_error_t *err) cleanup_free char *oci_error = NULL; libcrun_debug ("Loading container from config file: %s", path); container_def = runtime_spec_schema_config_schema_parse_file (path, NULL, &oci_error); - libcrun_error (0, "Not sure %s - %i - %s\n", path, container_def == NULL, oci_error); if (container_def == NULL) { crun_make_error (err, 0, "load `%s`: %s", path, oci_error);