Skip to content
Snippets Groups Projects

runtime: Cope with /tmp being a symlink

Merged Simon McVittie requested to merge wip/tolerate-tmp-symlink into master
1 file
+ 8
2
Compare changes
  • Side-by-side
  • Inline
+ 8
2
@@ -887,11 +887,17 @@ pv_runtime_initable_init (GInitable *initable,
@@ -887,11 +887,17 @@ pv_runtime_initable_init (GInitable *initable,
{
{
/* We currently only need a temporary directory if we don't have
/* We currently only need a temporary directory if we don't have
* a mutable sysroot to work with. */
* a mutable sysroot to work with. */
self->tmpdir = g_dir_make_tmp ("pressure-vessel-wrap.XXXXXX", error);
g_autofree gchar *tmpdir = g_dir_make_tmp ("pressure-vessel-wrap.XXXXXX",
 
error);
if (self->tmpdir == NULL)
if (tmpdir == NULL)
return FALSE;
return FALSE;
 
self->tmpdir = realpath (tmpdir, NULL);
 
 
if (self->tmpdir == NULL)
 
return glnx_throw_errno_prefix (error, "realpath(\"%s\")", tmpdir);
 
self->overrides = g_build_filename (self->tmpdir, "overrides", NULL);
self->overrides = g_build_filename (self->tmpdir, "overrides", NULL);
self->overrides_in_container = "/overrides";
self->overrides_in_container = "/overrides";
self->runtime_files = self->source_files;
self->runtime_files = self->source_files;
Loading