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
d76f9101
Commit
d76f9101
authored
5 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
wrap: Add the ability to copy regular files into the container
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
e04f6a15
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/wrap.c
+43
-19
43 additions, 19 deletions
src/wrap.c
with
43 additions
and
19 deletions
src/wrap.c
+
43
−
19
View file @
d76f9101
...
...
@@ -759,24 +759,26 @@ try_bind_dri (FlatpakBwrap *bwrap,
static
struct
{
FlatpakBwrap
*
bwrap
;
const
char
*
s
ymlink_farm
;
const
char
*
s
ource
;
const
char
*
dest
;
}
nftw_data
;
static
int
add_symlinks_to_bwrap
(
const
char
*
fpath
,
const
struct
stat
*
sb
,
int
typeflag
,
struct
FTW
*
ftwbuf
)
copy_tree_helper
(
const
char
*
fpath
,
const
struct
stat
*
sb
,
int
typeflag
,
struct
FTW
*
ftwbuf
)
{
const
char
*
path_in_container
;
g_autofree
gchar
*
target
=
NULL
;
gsize
prefix_len
;
int
fd
=
-
1
;
GError
*
error
=
NULL
;
g_return_val_if_fail
(
g_str_has_prefix
(
fpath
,
nftw_data
.
s
ymlink_farm
),
1
);
g_return_val_if_fail
(
g_str_has_suffix
(
nftw_data
.
s
ymlink_farm
,
nftw_data
.
dest
),
1
);
g_return_val_if_fail
(
g_str_has_prefix
(
fpath
,
nftw_data
.
s
ource
),
1
);
g_return_val_if_fail
(
g_str_has_suffix
(
nftw_data
.
s
ource
,
nftw_data
.
dest
),
1
);
prefix_len
=
strlen
(
nftw_data
.
s
ymlink_farm
)
-
strlen
(
nftw_data
.
dest
);
prefix_len
=
strlen
(
nftw_data
.
s
ource
)
-
strlen
(
nftw_data
.
dest
);
path_in_container
=
fpath
+
prefix_len
;
switch
(
typeflag
)
...
...
@@ -794,6 +796,19 @@ add_symlinks_to_bwrap (const char *fpath,
NULL
);
break
;
case
FTW_F
:
if
(
!
glnx_openat_rdonly
(
AT_FDCWD
,
fpath
,
FALSE
,
&
fd
,
&
error
))
{
g_warning
(
"Unable to copy file into container: %s"
,
error
->
message
);
g_clear_error
(
&
error
);
}
flatpak_bwrap_add_args_data_fd
(
nftw_data
.
bwrap
,
"--ro-bind-data"
,
glnx_steal_fd
(
&
fd
),
path_in_container
);
break
;
default:
g_warning
(
"Don't know how to handle ftw type flag %d at %s"
,
typeflag
,
fpath
);
...
...
@@ -802,25 +817,34 @@ add_symlinks_to_bwrap (const char *fpath,
return
0
;
}
/*
* For every symbolic link in @farm, add a corresponding symbolic link
* via the bwrap command-line.
/**
* pv_bwrap_copy_tree:
* @bwrap: The #FlatpakBwrap
* @source: A copy of the desired @dest in a temporary directory,
* for example `/tmp/tmp12345678/overrides/lib`. The path must end
* with @dest.
* @dest: The destination path in the container, which must be absolute.
*
* For every file, directory or symbolic link in @source, add a
* corresponding read-only file, directory or symbolic link via the bwrap
* command-line, so that the files, directories and symbolic links in the
* container will persist even after @source has been deleted.
*/
static
void
add_symlink_farm
(
FlatpakBwrap
*
bwrap
,
const
char
*
farm
,
const
char
*
dest
)
pv_bwrap_copy_tree
(
FlatpakBwrap
*
bwrap
,
const
char
*
source
,
const
char
*
dest
)
{
g_return_if_fail
(
nftw_data
.
bwrap
==
NULL
);
g_return_if_fail
(
dest
[
0
]
==
'/'
);
g_return_if_fail
(
g_str_has_suffix
(
farm
,
dest
));
g_return_if_fail
(
g_str_has_suffix
(
source
,
dest
));
nftw_data
.
bwrap
=
bwrap
;
nftw_data
.
s
ymlink_farm
=
farm
;
nftw_data
.
s
ource
=
source
;
nftw_data
.
dest
=
dest
;
nftw
(
farm
,
add_symlinks_to_bwrap
,
100
,
FTW_PHYS
);
nftw
(
source
,
copy_tree_helper
,
100
,
FTW_PHYS
);
nftw_data
.
bwrap
=
NULL
;
nftw_data
.
s
ymlink_farm
=
NULL
;
nftw_data
.
s
ource
=
NULL
;
nftw_data
.
dest
=
NULL
;
}
...
...
@@ -1185,7 +1209,7 @@ bind_runtime (FlatpakBwrap *bwrap,
"--unsetenv"
,
"LIBGL_DRIVERS_PATH"
,
NULL
);
add_symlink_farm
(
bwrap
,
overrides
,
"/overrides"
);
pv_bwrap_copy_tree
(
bwrap
,
overrides
,
"/overrides"
);
if
(
!
pv_bwrap_bind_usr
(
bwrap
,
"/"
,
"/run/host"
,
error
))
return
FALSE
;
...
...
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