Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
66556e60
Commit
66556e60
authored
5 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
runtime: Move more responsibility for runtime setup to here
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
66f3ecce
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/runtime.c
+8
-0
8 additions, 0 deletions
src/runtime.c
src/runtime.h
+0
-2
0 additions, 2 deletions
src/runtime.h
src/wrap.c
+0
-6
0 additions, 6 deletions
src/wrap.c
with
8 additions
and
8 deletions
src/runtime.c
+
8
−
0
View file @
66556e60
...
@@ -104,6 +104,8 @@ static const char * const libquals[] =
...
@@ -104,6 +104,8 @@ static const char * const libquals[] =
static
gboolean
pv_runtime_use_host_graphics_stack
(
PvRuntime
*
self
,
static
gboolean
pv_runtime_use_host_graphics_stack
(
PvRuntime
*
self
,
FlatpakBwrap
*
bwrap
,
FlatpakBwrap
*
bwrap
,
GError
**
error
);
GError
**
error
);
static
void
pv_runtime_set_search_paths
(
PvRuntime
*
self
,
FlatpakBwrap
*
bwrap
);
static
void
static
void
pv_runtime_init
(
PvRuntime
*
self
)
pv_runtime_init
(
PvRuntime
*
self
)
...
@@ -1760,6 +1762,10 @@ pv_runtime_bind (PvRuntime *self,
...
@@ -1760,6 +1762,10 @@ pv_runtime_bind (PvRuntime *self,
g_return_val_if_fail
(
!
pv_bwrap_was_finished
(
bwrap
),
FALSE
);
g_return_val_if_fail
(
!
pv_bwrap_was_finished
(
bwrap
),
FALSE
);
g_return_val_if_fail
(
error
==
NULL
||
*
error
==
NULL
,
FALSE
);
g_return_val_if_fail
(
error
==
NULL
||
*
error
==
NULL
,
FALSE
);
/* Start with just the root tmpfs (which appears automatically)
* and the standard API filesystems */
pv_bwrap_add_api_filesystems
(
bwrap
);
if
(
!
bind_runtime
(
self
,
bwrap
,
error
))
if
(
!
bind_runtime
(
self
,
bwrap
,
error
))
return
FALSE
;
return
FALSE
;
...
@@ -1772,6 +1778,8 @@ pv_runtime_bind (PvRuntime *self,
...
@@ -1772,6 +1778,8 @@ pv_runtime_bind (PvRuntime *self,
"/run/pressure-vessel"
,
"/run/pressure-vessel"
,
NULL
);
NULL
);
pv_runtime_set_search_paths
(
self
,
bwrap
);
return
TRUE
;
return
TRUE
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/runtime.h
+
0
−
2
View file @
66556e60
...
@@ -47,8 +47,6 @@ PvRuntime *pv_runtime_new (const char *source_files,
...
@@ -47,8 +47,6 @@ PvRuntime *pv_runtime_new (const char *source_files,
void
pv_runtime_append_lock_adverb
(
PvRuntime
*
self
,
void
pv_runtime_append_lock_adverb
(
PvRuntime
*
self
,
FlatpakBwrap
*
bwrap
);
FlatpakBwrap
*
bwrap
);
void
pv_runtime_set_search_paths
(
PvRuntime
*
self
,
FlatpakBwrap
*
bwrap
);
gboolean
pv_runtime_bind
(
PvRuntime
*
self
,
gboolean
pv_runtime_bind
(
PvRuntime
*
self
,
FlatpakBwrap
*
bwrap
,
FlatpakBwrap
*
bwrap
,
GError
**
error
);
GError
**
error
);
...
...
This diff is collapsed.
Click to expand it.
src/wrap.c
+
0
−
6
View file @
66556e60
...
@@ -1026,15 +1026,9 @@ main (int argc,
...
@@ -1026,15 +1026,9 @@ main (int argc,
tools_dir
,
tools_dir
,
error
);
error
);
/* Start with just the root tmpfs (which appears automatically)
* and the standard API filesystems */
pv_bwrap_add_api_filesystems
(
bwrap
);
if
(
runtime
==
NULL
)
if
(
runtime
==
NULL
)
goto
out
;
goto
out
;
pv_runtime_set_search_paths
(
runtime
,
bwrap
);
if
(
!
pv_runtime_bind
(
runtime
,
bwrap
,
error
))
if
(
!
pv_runtime_bind
(
runtime
,
bwrap
,
error
))
goto
out
;
goto
out
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment