aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar smitsohu <smitsohu@gmail.com>2021-01-18 21:54:33 +0100
committerLibravatar smitsohu <smitsohu@gmail.com>2021-01-18 21:54:33 +0100
commit6842a4416225a996595a37c6e26f28f25c2f6982 (patch)
tree6a2ba3a68e7df3548b8f00593b8d6cb8ede0efab
parentAdd 'seccomp-error-action log' to profile.template (diff)
downloadfirejail-6842a4416225a996595a37c6e26f28f25c2f6982.tar.gz
firejail-6842a4416225a996595a37c6e26f28f25c2f6982.tar.zst
firejail-6842a4416225a996595a37c6e26f28f25c2f6982.zip
private-lib: add timetrace for Firejail libraries
-rw-r--r--src/firejail/fs_lib.c16
1 files 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) {
337 timetrace_start(); 337 timetrace_start();
338 338
339 // bring in firejail executable libraries in case we are redirected here by a firejail symlink from /usr/local/bin/firejail 339 // bring in firejail executable libraries in case we are redirected here by a firejail symlink from /usr/local/bin/firejail
340 if (arg_debug || arg_debug_private_lib)
341 printf("Installing Firejail libraries\n");
340 fslib_install_list(PATH_FIREJAIL); 342 fslib_install_list(PATH_FIREJAIL);
341 343
342 // bring in firejail directory 344 // bring in firejail directory
343 fslib_install_list("firejail"); 345 fslib_install_list(LIBDIR "/firejail");
344 346
345 // for dhclient 347 // bring in dhclient libraries
346 if (any_dhcp()) 348 if (any_dhcp()) {
349 if (arg_debug || arg_debug_private_lib)
350 printf("Installing dhclient libraries\n");
347 fslib_install_list(RUN_MNT_DIR "/dhclient"); 351 fslib_install_list(RUN_MNT_DIR "/dhclient");
352 }
353 fmessage("Firejail libraries installed in %0.2f ms\n", timetrace_end());
354
355 timetrace_start();
348 356
349 // copy the libs in the new lib directory for the main exe 357 // copy the libs in the new lib directory for the main exe
350 if (cfg.original_program_index > 0) { 358 if (cfg.original_program_index > 0) {
@@ -379,7 +387,7 @@ void fs_private_lib(void) {
379 } 387 }
380 fmessage("Program libraries installed in %0.2f ms\n", timetrace_end()); 388 fmessage("Program libraries installed in %0.2f ms\n", timetrace_end());
381 389
382 // install the reset of the system libraries 390 // install the rest of the system libraries
383 if (arg_debug || arg_debug_private_lib) 391 if (arg_debug || arg_debug_private_lib)
384 printf("Installing system libraries\n"); 392 printf("Installing system libraries\n");
385 fslib_install_system(); 393 fslib_install_system();