marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Properly handle the session daemon not running

tingping/wmclass
Alexander Larsson 2015-01-29 15:11:51 +01:00
parent 2c50ebad51
commit c83e3a7f83
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdg-app-helper.c
View File

@ -245,6 +245,7 @@ ascii_isdigit (char c)
static int create_etc_symlink = 0;
static int create_etc_dir = 1;
static int create_monitor_links = 0;
static const create_table_t create[] = {
{ FILE_TYPE_DIR, ".oldroot", 0755 },
@ -270,7 +271,7 @@ static const create_table_t create[] = {
{ FILE_TYPE_DIR, "etc", 0755, NULL, 0, &create_etc_dir},
{ FILE_TYPE_REGULAR, "etc/passwd", 0755, NULL, 0, &create_etc_dir},
{ FILE_TYPE_REGULAR, "etc/group", 0755, NULL, 0, &create_etc_dir},
{ FILE_TYPE_SYMLINK, "etc/resolv.conf", 0755, "/run/user/%1$d/xdg-app-monitor/resolv.conf", 0, &create_etc_dir},
{ FILE_TYPE_SYMLINK, "etc/resolv.conf", 0755, "/run/user/%1$d/xdg-app-monitor/resolv.conf", 0, &create_monitor_links},
{ FILE_TYPE_REGULAR, "etc/machine-id", 0755, NULL, 0, &create_etc_dir},
{ FILE_TYPE_DIR, "tmp/.X11-unix", 0755 },
{ FILE_TYPE_REGULAR, "tmp/.X11-unix/X99", 0755 },
@ -627,7 +628,7 @@ link_extra_etc_dirs ()
dst_path = strconcat ("/usr/etc/", dirent->d_name);
if (symlink (dst_path, src_path) != 0)
die ("symlink %s", src_path);
die_with_error ("symlink %s", src_path);
free (dst_path);
free (src_path);
@ -1103,6 +1104,9 @@ main (int argc,
}
}
if (monitor_path != NULL && create_etc_dir)
create_monitor_links = 1;
if (n_args < 2)
usage (argv);