Skip to content

Commit

Permalink
Fix return value of generator on non-ostree systems
Browse files Browse the repository at this point in the history
Commit aa72caf
regressed the `ostree-system-generator` on non-ostree systems.
If there's no `ostree=` karg, we need to just exit 0.

Closes: #2909
Fixes: aa72caf
  • Loading branch information
cgwalters committed Jun 28, 2023
1 parent e0e2144 commit 3c76d03
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/switchroot/ostree-mount-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ get_ostree_target (void)
autofree char *ostree_cmdline = read_proc_cmdline_key ("ostree");

if (!ostree_cmdline)
errx (EXIT_FAILURE, "No ostree= cmdline");
return NULL;

if (strcmp (ostree_cmdline, "aboot") == 0)
return get_aboot_root_slot ();
Expand Down
2 changes: 2 additions & 0 deletions src/switchroot/ostree-prepare-root.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ resolve_deploy_path (const char *root_mountpoint)
struct stat stbuf;
char *deploy_path;
autofree char *ostree_target = get_ostree_target ();
if (!ostree_target)
errx (EXIT_FAILURE, "No ostree= cmdline");

if (snprintf (destpath, sizeof (destpath), "%s/%s", root_mountpoint, ostree_target) < 0)
err (EXIT_FAILURE, "failed to assemble ostree target path");
Expand Down
2 changes: 2 additions & 0 deletions src/switchroot/ostree-system-generator.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ main (int argc, char *argv[])
* is PID 1 (and so hasn't created /run/ostree-booted).
*/
autofree char *ostree_target = get_ostree_target ();
if (!ostree_target)
exit (EXIT_SUCCESS);

/* See comments in ostree-prepare-root.c for this.
*
Expand Down

0 comments on commit 3c76d03

Please sign in to comment.