mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-22 00:41:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

run: Break out /usr link creation to helper

Browse Source 
This is the code needed to set up the symlinks into the runtime
to make stuff work. We will need this separately for minimal runtime
use.

Closes: #1073
Approved by: alexlarsson
This commit is contained in:
Alexander Larsson
2017-10-03 12:11:48 +02:00
committed by Atomic Bot
parent 5cd8db035b
commit f06cae1556
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
common/flatpak-run.c
View File

@@ -4468,6 +4468,32 @@ setup_seccomp (GPtrArray *argv_array,
}
#endif
static void
flatpak_run_setup_usr_links (GPtrArray *argv_array,
GFile *runtime_files)
{
const char *usr_links[] = {"lib", "lib32", "lib64", "bin", "sbin"};
int i;
if (runtime_files == NULL)
return;
for (i = 0; i < G_N_ELEMENTS (usr_links); i++)
{
const char *subdir = usr_links[i];
g_autoptr(GFile) runtime_subdir = g_file_get_child (runtime_files, subdir);
if (g_file_query_exists (runtime_subdir, NULL))
{
g_autofree char *link = g_strconcat ("usr/", subdir, NULL);
g_autofree char *dest = g_strconcat ("/", subdir, NULL);
add_args (argv_array,
"--symlink", link, dest,
NULL);
}
}
}
gboolean
flatpak_run_setup_base_argv (GPtrArray *argv_array,
GArray *fd_array,
@@ -4477,9 +4503,7 @@ flatpak_run_setup_base_argv (GPtrArray *argv_array,
FlatpakRunFlags flags,
GError **error)
{
const char *usr_links[] = {"lib", "lib32", "lib64", "bin", "sbin"};
g_autofree char *run_dir = g_strdup_printf ("/run/user/%d", getuid ());
int i;
g_autofree char *passwd_contents = NULL;
g_autofree char *group_contents = NULL;
struct group *g = getgrgid (getgid ());
@@ -4605,19 +4629,7 @@ flatpak_run_setup_base_argv (GPtrArray *argv_array,
NULL);
}
for (i = 0; runtime_files != NULL && i < G_N_ELEMENTS (usr_links); i++)
{
const char *subdir = usr_links[i];
g_autoptr(GFile) runtime_subdir = g_file_get_child (runtime_files, subdir);
if (g_file_query_exists (runtime_subdir, NULL))
{
g_autofree char *link = g_strconcat ("usr/", subdir, NULL);
g_autofree char *dest = g_strconcat ("/", subdir, NULL);
add_args (argv_array,
"--symlink", link, dest,
NULL);
}
}
flatpak_run_setup_usr_links (argv_array, runtime_files);
pers = PER_LINUX;