diff options
author | netblue30 <netblue30@yahoo.com> | 2018-03-21 08:56:54 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-03-21 08:56:54 -0400 |
commit | 57ffc35a8e0264507118b9839a499375f416260c (patch) | |
tree | 7f406d1be0674ee964c300910f10480c68191708 /src/man | |
parent | Merge pull request #1820 from g3ngr33n/master (diff) | |
download | firejail-57ffc35a8e0264507118b9839a499375f416260c.tar.gz firejail-57ffc35a8e0264507118b9839a499375f416260c.tar.zst firejail-57ffc35a8e0264507118b9839a499375f416260c.zip |
added sandbox name support in firemon
Diffstat (limited to 'src/man')
-rw-r--r-- | src/man/firejail.txt | 29 | ||||
-rw-r--r-- | src/man/firemon.txt | 22 |
2 files changed, 25 insertions, 26 deletions
diff --git a/src/man/firejail.txt b/src/man/firejail.txt index b05a5a722..34e4102f6 100644 --- a/src/man/firejail.txt +++ b/src/man/firejail.txt | |||
@@ -254,7 +254,7 @@ Example: | |||
254 | .br | 254 | .br |
255 | $ firejail \-\-list | 255 | $ firejail \-\-list |
256 | .br | 256 | .br |
257 | 3272:netblue:firejail \-\-private firefox | 257 | 3272:netblue::firejail \-\-private firefox |
258 | .br | 258 | .br |
259 | $ firejail \-\-caps.print=3272 | 259 | $ firejail \-\-caps.print=3272 |
260 | 260 | ||
@@ -309,7 +309,7 @@ Example: | |||
309 | .br | 309 | .br |
310 | $ firejail \-\-list | 310 | $ firejail \-\-list |
311 | .br | 311 | .br |
312 | 3272:netblue:firejail \-\-private firefox | 312 | 3272:netblue::firejail \-\-private firefox |
313 | .br | 313 | .br |
314 | $ firejail \-\-cpu.print=3272 | 314 | $ firejail \-\-cpu.print=3272 |
315 | 315 | ||
@@ -453,7 +453,7 @@ Example: | |||
453 | .br | 453 | .br |
454 | $ firejail \-\-list | 454 | $ firejail \-\-list |
455 | .br | 455 | .br |
456 | 3272:netblue:firejail \-\-private firefox | 456 | 3272:netblue::firejail \-\-private firefox |
457 | .br | 457 | .br |
458 | $ firejail \-\-dns.print=3272 | 458 | $ firejail \-\-dns.print=3272 |
459 | 459 | ||
@@ -492,7 +492,7 @@ Example: | |||
492 | .br | 492 | .br |
493 | $ firejail \-\-list | 493 | $ firejail \-\-list |
494 | .br | 494 | .br |
495 | 3272:netblue:firejail \-\-private firefox | 495 | 3272:netblue::firejail \-\-private firefox |
496 | .br | 496 | .br |
497 | $ firejail \-\-fs.print=3272 | 497 | $ firejail \-\-fs.print=3272 |
498 | 498 | ||
@@ -662,7 +662,7 @@ Example: | |||
662 | .br | 662 | .br |
663 | $ firejail \-\-list | 663 | $ firejail \-\-list |
664 | .br | 664 | .br |
665 | 3272:netblue:firejail \-\-private firefox | 665 | 3272:netblue::firejail \-\-private firefox |
666 | .br | 666 | .br |
667 | $ firejail \-\-join=3272 | 667 | $ firejail \-\-join=3272 |
668 | 668 | ||
@@ -749,11 +749,11 @@ Example: | |||
749 | .br | 749 | .br |
750 | $ firejail \-\-list | 750 | $ firejail \-\-list |
751 | .br | 751 | .br |
752 | 7015:netblue:firejail firefox | 752 | 7015:netblue:browser:firejail firefox |
753 | .br | 753 | .br |
754 | 7056:netblue:firejail \-\-net=eth0 transmission-gtk | 754 | 7056:netblue:torrent:firejail \-\-net=eth0 transmission-gtk |
755 | .br | 755 | .br |
756 | 7064:netblue:firejail \-\-noroot xterm | 756 | 7064:netblue::firejail \-\-noroot xterm |
757 | .br | 757 | .br |
758 | $ | 758 | $ |
759 | .TP | 759 | .TP |
@@ -1543,7 +1543,7 @@ Example: | |||
1543 | .br | 1543 | .br |
1544 | $ firejail \-\-list | 1544 | $ firejail \-\-list |
1545 | .br | 1545 | .br |
1546 | 3272:netblue:firejail \-\-private firefox | 1546 | 3272:netblue::firejail \-\-private firefox |
1547 | .br | 1547 | .br |
1548 | $ firejail \-\-protocol.print=3272 | 1548 | $ firejail \-\-protocol.print=3272 |
1549 | .br | 1549 | .br |
@@ -1992,7 +1992,7 @@ Example: | |||
1992 | .br | 1992 | .br |
1993 | $ firejail \-\-list | 1993 | $ firejail \-\-list |
1994 | .br | 1994 | .br |
1995 | 3272:netblue:firejail \-\-private firefox | 1995 | 3272:netblue::firejail \-\-private firefox |
1996 | .br | 1996 | .br |
1997 | $ firejail \-\-shutdown=3272 | 1997 | $ firejail \-\-shutdown=3272 |
1998 | .TP | 1998 | .TP |
@@ -2598,12 +2598,12 @@ Limitations: audit feature is not implemented for --x11 commands. | |||
2598 | Option \-\-list prints a list of all sandboxes. The format | 2598 | Option \-\-list prints a list of all sandboxes. The format |
2599 | for each process entry is as follows: | 2599 | for each process entry is as follows: |
2600 | 2600 | ||
2601 | PID:USER:Command | 2601 | PID:USER:Sandbox Name:Command |
2602 | 2602 | ||
2603 | Option \-\-tree prints the tree of processes running in the sandbox. The format | 2603 | Option \-\-tree prints the tree of processes running in the sandbox. The format |
2604 | for each process entry is as follows: | 2604 | for each process entry is as follows: |
2605 | 2605 | ||
2606 | PID:USER:Command | 2606 | PID:USER:Sandbox Name:Command |
2607 | 2607 | ||
2608 | Option \-\-top is similar to the UNIX top command, however it applies only to | 2608 | Option \-\-top is similar to the UNIX top command, however it applies only to |
2609 | sandboxes. | 2609 | sandboxes. |
@@ -2635,6 +2635,9 @@ It is a sum of the RES values for all processes running in the sandbox. | |||
2635 | RX(KB/s) | 2635 | RX(KB/s) |
2636 | Network receive speed. | 2636 | Network receive speed. |
2637 | .TP | 2637 | .TP |
2638 | Sandbox Name | ||
2639 | The name of the sandbox, if any. | ||
2640 | .TP | ||
2638 | SHR | 2641 | SHR |
2639 | Shared Memory Size (KiB), it reflects memory shared with other | 2642 | Shared Memory Size (KiB), it reflects memory shared with other |
2640 | processes. It is a sum of the SHR values for all processes running | 2643 | processes. It is a sum of the SHR values for all processes running |
@@ -2646,7 +2649,7 @@ Network transmit speed. | |||
2646 | Uptime | 2649 | Uptime |
2647 | Sandbox running time in hours:minutes:seconds format. | 2650 | Sandbox running time in hours:minutes:seconds format. |
2648 | .TP | 2651 | .TP |
2649 | User | 2652 | USER |
2650 | The owner of the sandbox. | 2653 | The owner of the sandbox. |
2651 | 2654 | ||
2652 | .SH SECURITY PROFILES | 2655 | .SH SECURITY PROFILES |
diff --git a/src/man/firemon.txt b/src/man/firemon.txt index 4827bbbeb..91c59af4d 100644 --- a/src/man/firemon.txt +++ b/src/man/firemon.txt | |||
@@ -50,7 +50,8 @@ Print route table for each sandbox. | |||
50 | Print seccomp configuration for each sandbox. | 50 | Print seccomp configuration for each sandbox. |
51 | .TP | 51 | .TP |
52 | \fB\-\-top | 52 | \fB\-\-top |
53 | Monitor the most CPU-intensive sandboxes. | 53 | Monitor the most CPU-intensive sandboxes. This command is similar to |
54 | the regular UNIX top command, however it applies only to sandboxes. | ||
54 | .TP | 55 | .TP |
55 | \fB\-\-tree | 56 | \fB\-\-tree |
56 | Print a tree of all sandboxed processes. | 57 | Print a tree of all sandboxed processes. |
@@ -63,19 +64,11 @@ Print program version and exit. | |||
63 | Print X11 display number. | 64 | Print X11 display number. |
64 | 65 | ||
65 | .PP | 66 | .PP |
66 | Option \-\-list prints a list of all sandboxes. The format | 67 | The format for each listed sandbox entry is as follows: |
67 | for each entry is as follows: | ||
68 | 68 | ||
69 | PID:USER:Command | 69 | PID:USER:Sandbox Name:Command |
70 | 70 | ||
71 | Option \-\-tree prints the tree of processes running in the sandbox. The format | 71 | Listed below are the available fields (columns) in various firemon commands in alphabetical order: |
72 | for each process entry is as follows: | ||
73 | |||
74 | PID:USER:Command | ||
75 | |||
76 | Option \-\-top is similar to the UNIX top command, however it applies only to | ||
77 | sandboxes. Listed below are the available fields (columns) in alphabetical | ||
78 | order: | ||
79 | 72 | ||
80 | .TP | 73 | .TP |
81 | Command | 74 | Command |
@@ -95,6 +88,9 @@ RES | |||
95 | Resident Memory Size (KiB), sandbox non-swapped physical memory. | 88 | Resident Memory Size (KiB), sandbox non-swapped physical memory. |
96 | It is a sum of the RES values for all processes running in the sandbox. | 89 | It is a sum of the RES values for all processes running in the sandbox. |
97 | .TP | 90 | .TP |
91 | Sandbox Name | ||
92 | The name of the sandbox, if any. | ||
93 | .TP | ||
98 | SHR | 94 | SHR |
99 | Shared Memory Size (KiB), it reflects memory shared with other | 95 | Shared Memory Size (KiB), it reflects memory shared with other |
100 | processes. It is a sum of the SHR values for all processes running | 96 | processes. It is a sum of the SHR values for all processes running |
@@ -103,7 +99,7 @@ in the sandbox, including the controlling process. | |||
103 | Uptime | 99 | Uptime |
104 | Sandbox running time in hours:minutes:seconds format. | 100 | Sandbox running time in hours:minutes:seconds format. |
105 | .TP | 101 | .TP |
106 | User | 102 | USER |
107 | The owner of the sandbox. | 103 | The owner of the sandbox. |
108 | 104 | ||
109 | .SH LICENSE | 105 | .SH LICENSE |