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

app: Only remount /sysroot if needed 

We should only try to remount `/sysroot` if we're actually handling the
sysroot repo and the repo isn't writable. We already have public APIs to
check each of those, so let's use them.

Closes: #2485
This commit is contained in:
Jonathan Lebon 2021-11-19 10:44:03 -05:00
parent f552e30c0b
commit 947acbf178
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ostree/ot-main.c
View File

@ -238,7 +238,7 @@ ostree_run (int argc,
return 0; return 0;
} }
/* Process a --repo arg; used below, and for the remote builtins */ /* Process a --repo arg. */
static OstreeRepo * static OstreeRepo *
parse_repo_option (GOptionContext *context, parse_repo_option (GOptionContext *context,
const char *repo_path, const char *repo_path,
@ -248,19 +248,6 @@ parse_repo_option (GOptionContext *context,
{ {
g_autoptr(OstreeRepo) repo = NULL; g_autoptr(OstreeRepo) repo = NULL;
/* This is a bit of a brutal hack; we set up a mount
* namespace if it appears that we may need it. It'd
* be better to do this more precisely in the future.
*/
gboolean setup_ns = FALSE;
if (!maybe_setup_mount_namespace (&setup_ns, error))
return FALSE;
if (setup_ns)
{
if (mount ("/sysroot", "/sysroot", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
return glnx_null_throw_errno_prefix (error, "Remounting /sysroot read-write");
}
if (repo_path == NULL) if (repo_path == NULL)
{ {
g_autoptr(GError) local_error = NULL; g_autoptr(GError) local_error = NULL;
@ -300,6 +287,43 @@ parse_repo_option (GOptionContext *context,
return g_steal_pointer (&repo); return g_steal_pointer (&repo);
} }
/* Process a --repo arg, determining if we should remount /sysroot; used below, and for the remote builtins */
static OstreeRepo *
parse_repo_option_and_maybe_remount (GOptionContext *context,
const char *repo_path,
gboolean skip_repo_open,
GCancellable *cancellable,
GError **error)
{
g_autoptr(OstreeRepo) repo = parse_repo_option (context, repo_path, skip_repo_open, cancellable, error);
if (!repo)
return NULL;
/* This is a bit of a brutal hack; we set up a mount
* namespace if it appears that we may need it. It'd
* be better to do this more precisely in the future.
*/
if (ostree_repo_is_system (repo) && !ostree_repo_is_writable (repo, NULL))
{
gboolean setup_ns = FALSE;
if (!maybe_setup_mount_namespace (&setup_ns, error))
return FALSE;
if (setup_ns)
{
if (mount ("/sysroot", "/sysroot", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
return glnx_null_throw_errno_prefix (error, "Remounting /sysroot read-write");
/* Reload the repo so it's actually writable. */
g_clear_pointer (&repo, g_object_unref);
repo = parse_repo_option (context, repo_path, skip_repo_open, cancellable, error);
if (!repo)
return NULL;
}
}
return g_steal_pointer (&repo);
}
/* Used by the remote builtins which are special in taking --sysroot or --repo */ /* Used by the remote builtins which are special in taking --sysroot or --repo */
gboolean gboolean
ostree_parse_sysroot_or_repo_option (GOptionContext *context, ostree_parse_sysroot_or_repo_option (GOptionContext *context,
@ -323,7 +347,7 @@ ostree_parse_sysroot_or_repo_option (GOptionContext *context,
} }
else else
{ {
repo = parse_repo_option (context, repo_path, FALSE, cancellable, error); repo = parse_repo_option_and_maybe_remount (context, repo_path, FALSE, cancellable, error);
if (!repo) if (!repo)
return FALSE; return FALSE;
} }
@ -424,8 +448,8 @@ ostree_option_context_parse (GOptionContext *context,
if (!(flags & OSTREE_BUILTIN_FLAG_NO_REPO)) if (!(flags & OSTREE_BUILTIN_FLAG_NO_REPO))
{ {
repo = parse_repo_option (context, opt_repo, (flags & OSTREE_BUILTIN_FLAG_NO_CHECK) > 0, repo = parse_repo_option_and_maybe_remount (context, opt_repo, (flags & OSTREE_BUILTIN_FLAG_NO_CHECK) > 0,
cancellable, error); cancellable, error);
if (!repo) if (!repo)
return FALSE; return FALSE;
} }