diff options
author | netblue30 <netblue30@yahoo.com> | 2017-10-15 19:52:16 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-10-15 19:52:16 -0400 |
commit | 843e612821cab2d9cc8c3ea3b1989e17e7541f82 (patch) | |
tree | 9a521612a23240c1740953054324bdde5eed9fd6 /src | |
parent | Merge branch 'master' of https://github.com/netblue30/firejail (diff) | |
download | firejail-843e612821cab2d9cc8c3ea3b1989e17e7541f82.tar.gz firejail-843e612821cab2d9cc8c3ea3b1989e17e7541f82.tar.zst firejail-843e612821cab2d9cc8c3ea3b1989e17e7541f82.zip |
trace install time for private directories
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/fs_etc.c | 5 | ||||
-rw-r--r-- | src/firejail/fs_home.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c index 9502844b2..1fa1b83c3 100644 --- a/src/firejail/fs_etc.c +++ b/src/firejail/fs_etc.c | |||
@@ -140,6 +140,8 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c | |||
140 | assert(private_run_dir); | 140 | assert(private_run_dir); |
141 | assert(private_list); | 141 | assert(private_list); |
142 | 142 | ||
143 | timetrace_start(); | ||
144 | |||
143 | // create /run/firejail/mnt/etc directory | 145 | // create /run/firejail/mnt/etc directory |
144 | mkdir_attr(private_run_dir, 0755, 0, 0); | 146 | mkdir_attr(private_run_dir, 0755, 0, 0); |
145 | fs_logger2("tmpfs", private_dir); | 147 | fs_logger2("tmpfs", private_dir); |
@@ -173,4 +175,7 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c | |||
173 | if (mount(private_run_dir, private_dir, NULL, MS_BIND|MS_REC, NULL) < 0) | 175 | if (mount(private_run_dir, private_dir, NULL, MS_BIND|MS_REC, NULL) < 0) |
174 | errExit("mount bind"); | 176 | errExit("mount bind"); |
175 | fs_logger2("mount", private_dir); | 177 | fs_logger2("mount", private_dir); |
178 | |||
179 | if (!arg_quiet) | ||
180 | fprintf(stderr, "Private %s installed in %0.2f ms\n", private_dir, timetrace_end()); | ||
176 | } | 181 | } |
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c index 0de003e58..6d3818ccb 100644 --- a/src/firejail/fs_home.c +++ b/src/firejail/fs_home.c | |||
@@ -462,6 +462,8 @@ static void duplicate(char *name) { | |||
462 | // set skel files, | 462 | // set skel files, |
463 | // restore .Xauthority | 463 | // restore .Xauthority |
464 | void fs_private_home_list(void) { | 464 | void fs_private_home_list(void) { |
465 | timetrace_start(); | ||
466 | |||
465 | char *homedir = cfg.homedir; | 467 | char *homedir = cfg.homedir; |
466 | char *private_list = cfg.home_private_keep; | 468 | char *private_list = cfg.home_private_keep; |
467 | assert(homedir); | 469 | assert(homedir); |
@@ -519,4 +521,8 @@ void fs_private_home_list(void) { | |||
519 | copy_xauthority(); | 521 | copy_xauthority(); |
520 | if (aflag) | 522 | if (aflag) |
521 | copy_asoundrc(); | 523 | copy_asoundrc(); |
524 | |||
525 | if (!arg_quiet) | ||
526 | fprintf(stderr, "Home directory installed in %0.2f ms\n", timetrace_end()); | ||
527 | |||
522 | } | 528 | } |