packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/sysroot: Fix error handling when mounting overlayfs fails 

This isn't perfect, but at least we fix an error-overwrite error, and in
practice `ostree admin unlock` isn't wrapped by `rpm-ostree` yet, so spew to
stderr is OK.

Closes: https://github.com/ostreedev/ostree/issues/1273

Closes: #1279
Approved by: guyshapiro
This commit is contained in:
Colin Walters 2017-10-16 15:29:38 -04:00 committed by Atomic Bot
parent e744f2ad6f
commit 464965e6b4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-sysroot.c
View File

@ -22,6 +22,7 @@
#include "otutil.h" #include "otutil.h"
#include <sys/file.h> #include <sys/file.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <err.h>
#include <sys/wait.h> #include <sys/wait.h>
#include "ostree.h" #include "ostree.h"
@ -1764,11 +1765,15 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self,
return glnx_throw_errno_prefix (error, "fork"); return glnx_throw_errno_prefix (error, "fork");
else if (mount_child == 0) else if (mount_child == 0)
{ {
/* Child process. Do NOT use any GLib API here. */ /* Child process. Do NOT use any GLib API here; it's not generally fork() safe.
*
* TODO: report errors across a pipe (or use the journal?) rather than
* spewing to stderr.
*/
if (fchdir (deployment_dfd) < 0) if (fchdir (deployment_dfd) < 0)
exit (EXIT_FAILURE); err (1, "fchdir");
if (mount ("overlay", "/usr", "overlay", 0, ovl_options) < 0) if (mount ("overlay", "/usr", "overlay", 0, ovl_options) < 0)
exit (EXIT_FAILURE); err (1, "mount");
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
else else
@ -1779,7 +1784,7 @@ ostree_sysroot_deployment_unlock (OstreeSysroot *self,
if (TEMP_FAILURE_RETRY (waitpid (mount_child, &estatus, 0)) < 0) if (TEMP_FAILURE_RETRY (waitpid (mount_child, &estatus, 0)) < 0)
return glnx_throw_errno_prefix (error, "waitpid() on mount helper"); return glnx_throw_errno_prefix (error, "waitpid() on mount helper");
if (!g_spawn_check_exit_status (estatus, error)) if (!g_spawn_check_exit_status (estatus, error))
return glnx_throw_errno_prefix (error, "overlayfs mount helper"); return glnx_prefix_error (error, "Failed overlayfs mount");
} }
} }