From c5ad45e5059cfcc3cb9d312e0384e4604e2d5220 Mon Sep 17 00:00:00 2001 From: smitsohu Date: Wed, 20 Jan 2021 15:27:47 +0100 Subject: private-lib: simplify installation of stdc as modern-day Debian only keeps a single symbolic link in /lib64, going through both directories systematically adds virtually no overhead (as indicated by the timetrace). At the same time it is simpler and more robust in producing a correct representation of the filesystem. --- src/firejail/fs_lib2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c index 758e079a4..95e10ee05 100644 --- a/src/firejail/fs_lib2.c +++ b/src/firejail/fs_lib2.c @@ -108,18 +108,13 @@ void fslib_install_stdc(void) { // install standard C libraries timetrace_start(); struct stat s; - char *stdclib = "/lib64"; // CentOS, Fedora, Arch - if (stat("/lib/x86_64-linux-gnu", &s) == 0) { // Debian & friends - // PT_INTERP - fslib_duplicate("/lib64/ld-linux-x86-64.so.2"); - mkdir_attr(RUN_LIB_DIR "/x86_64-linux-gnu", 0755, 0, 0); selinux_relabel_path(RUN_LIB_DIR "/x86_64-linux-gnu", "/lib/x86_64-linux-gnu"); - stdclib = "/lib/x86_64-linux-gnu"; + stdc("/lib/x86_64-linux-gnu"); } - stdc(stdclib); + stdc("/lib64"); // CentOS, Fedora, Arch, ld-linux.so in Debian & friends // install locale if (stat("/usr/lib/locale", &s) == 0) -- cgit v1.2.3-70-g09d2