aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-05-04 12:18:50 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2016-05-04 12:18:50 -0400
commitc3354382c92b386da5ed76f5b12643412a2d32ea (patch)
tree15dbce7fd053998ffd2c0618ddd3e5694b47c3f4 /src
parenttest fixes (diff)
downloadfirejail-c3354382c92b386da5ed76f5b12643412a2d32ea.tar.gz
firejail-c3354382c92b386da5ed76f5b12643412a2d32ea.tar.zst
firejail-c3354382c92b386da5ed76f5b12643412a2d32ea.zip
rename generic.profile as default.profile
Diffstat (limited to 'src')
-rw-r--r--src/firejail/firejail.h2
-rw-r--r--src/firejail/main.c4
-rw-r--r--src/man/firejail-profile.txt2
-rw-r--r--src/man/firejail.txt4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 302883310..f4a176caf 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -68,7 +68,7 @@
68#define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" 68#define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger"
69 69
70// profiles 70// profiles
71#define DEFAULT_USER_PROFILE "generic" 71#define DEFAULT_USER_PROFILE "default"
72#define DEFAULT_ROOT_PROFILE "server" 72#define DEFAULT_ROOT_PROFILE "server"
73#define MAX_INCLUDE_LEVEL 6 // include levels in profile files 73#define MAX_INCLUDE_LEVEL 6 // include levels in profile files
74 74
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 3ba3dd531..7aa81a9c5 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -696,7 +696,7 @@ int main(int argc, char **argv) {
696 int option_force = 0; 696 int option_force = 0;
697 int custom_profile = 0; // custom profile loaded 697 int custom_profile = 0; // custom profile loaded
698 char *custom_profile_dir = NULL; // custom profile directory 698 char *custom_profile_dir = NULL; // custom profile directory
699 int arg_noprofile = 0; // use generic.profile if none other found/specified 699 int arg_noprofile = 0; // use default.profile if none other found/specified
700#ifdef HAVE_SECCOMP 700#ifdef HAVE_SECCOMP
701 int highest_errno = errno_highest_nr(); 701 int highest_errno = errno_highest_nr();
702#endif 702#endif
@@ -1920,7 +1920,7 @@ int main(int argc, char **argv) {
1920 } 1920 }
1921 } 1921 }
1922 1922
1923 // use generic.profile as the default 1923 // use default.profile as the default
1924 if (!custom_profile && !arg_noprofile) { 1924 if (!custom_profile && !arg_noprofile) {
1925 if (cfg.chrootdir) 1925 if (cfg.chrootdir)
1926 fprintf(stderr, "Warning: default profile disabled by --chroot option\n"); 1926 fprintf(stderr, "Warning: default profile disabled by --chroot option\n");
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 19063f5ef..0e9614ab6 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -44,7 +44,7 @@ To disable default profile loading, use --noprofile command option. Example:
44.RS 44.RS
45$ firejail 45$ firejail
46.br 46.br
47Reading profile /etc/firejail/generic.profile 47Reading profile /etc/firejail/default.profile
48.br 48.br
49Parent pid 8553, child pid 8554 49Parent pid 8553, child pid 8554
50.br 50.br
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 6be278063..995aee809 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -868,7 +868,7 @@ Example:
868.br 868.br
869$ firejail 869$ firejail
870.br 870.br
871Reading profile /etc/firejail/generic.profile 871Reading profile /etc/firejail/default.profile
872.br 872.br
873Parent pid 8553, child pid 8554 873Parent pid 8553, child pid 8554
874.br 874.br
@@ -1786,7 +1786,7 @@ To disable default profile loading, use --noprofile command option. Example:
1786.RS 1786.RS
1787$ firejail 1787$ firejail
1788.br 1788.br
1789Reading profile /etc/firejail/generic.profile 1789Reading profile /etc/firejail/default.profile
1790.br 1790.br
1791Parent pid 8553, child pid 8554 1791Parent pid 8553, child pid 8554
1792.br 1792.br