using /etc/firejail/server.profile as default profile if the sandbox is started by root

1 files changed, 18 insertions, 14 deletions

diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 246098bb7..5167a4c42 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -7,15 +7,18 @@ profile \- Security profile file syntax for Firejail
 firejail \-\-profile=filename.profile
 
 .SH DESCRIPTION
-Several Firejail command line configuration options can be passed to the program using
-profile files. 
-Firejail chooses a security profile in the following order:
+Several command line options can be passed to the program using
+profile files. Firejail chooses the profile file as follows:
 
-1. If a profile is provided by the user with --profile option, the profile is loaded.
+1. If a profile file is provided by the user with --profile option, the profile file is loaded.
 Example:
 .PP
 .RS
 $ firejail --profile=/home/netblue/icecat.profile icecat
+.br
+Reading profile /home/netblue/icecat.profile
+.br
+[...]
 .RE
 
 2. If a profile file with the same name as the application is present in ~/.config/firejail directory or
@@ -26,7 +29,6 @@ $ firejail icecat
 .br
 Command name #icecat#
 .br
-.br
 Found icecat profile in /home/netblue/.config/firejail directory
 .br
 Reading profile /home/netblue/.config/firejail/icecat.profile
@@ -34,29 +36,31 @@ Reading profile /home/netblue/.config/firejail/icecat.profile
 [...]
 .RE
 
-3. Use the default profile in /etc/firejail/generic.profile. This can be disabled with --noprofile. Example:
+3. Use a default.profile file if the sandbox
+is started by a regular user, or a server.profile file if the sandbox
+is started by root. Firejail looks for these files in ~/.config/firejail directory, followed by /etc/firejail directory.
+To disable default profile loading, use --noroot command option. Example:
 .PP
 .RS
-$ firejail \-\-noprofile
+$ firejail
+.br
+Reading profile /etc/firejail/generic.profile
 .br
 Parent pid 8553, child pid 8554
 .br
 Child process initialized
 .br
-$ exit
+[...] 
 .br
+
 .br
-parent is shutting down, bye...
-.br
-$ firejail
-.br
-Reading profile /etc/firejail/generic.profile
+$ firejail \-\-noprofile
 .br
 Parent pid 8553, child pid 8554
 .br
 Child process initialized
 .br
-$ 
+[...]
 .RE
 
 .SH Scripting