From 6842a4416225a996595a37c6e26f28f25c2f6982 Mon Sep 17 00:00:00 2001 From: smitsohu Date: Mon, 18 Jan 2021 21:54:33 +0100 Subject: private-lib: add timetrace for Firejail libraries --- src/firejail/fs_lib.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index a5c005931..1095a9fa8 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c @@ -337,14 +337,22 @@ void fs_private_lib(void) { timetrace_start(); // bring in firejail executable libraries in case we are redirected here by a firejail symlink from /usr/local/bin/firejail + if (arg_debug || arg_debug_private_lib) + printf("Installing Firejail libraries\n"); fslib_install_list(PATH_FIREJAIL); // bring in firejail directory - fslib_install_list("firejail"); + fslib_install_list(LIBDIR "/firejail"); - // for dhclient - if (any_dhcp()) + // bring in dhclient libraries + if (any_dhcp()) { + if (arg_debug || arg_debug_private_lib) + printf("Installing dhclient libraries\n"); fslib_install_list(RUN_MNT_DIR "/dhclient"); + } + fmessage("Firejail libraries installed in %0.2f ms\n", timetrace_end()); + + timetrace_start(); // copy the libs in the new lib directory for the main exe if (cfg.original_program_index > 0) { @@ -379,7 +387,7 @@ void fs_private_lib(void) { } fmessage("Program libraries installed in %0.2f ms\n", timetrace_end()); - // install the reset of the system libraries + // install the rest of the system libraries if (arg_debug || arg_debug_private_lib) printf("Installing system libraries\n"); fslib_install_system(); -- cgit v1.2.3-54-g00ecf