From c3354382c92b386da5ed76f5b12643412a2d32ea Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Wed, 4 May 2016 12:18:50 -0400
Subject: rename generic.profile as default.profile

---
 src/firejail/firejail.h      | 2 +-
 src/firejail/main.c          | 4 ++--
 src/man/firejail-profile.txt | 2 +-
 src/man/firejail.txt         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

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 @@
 #define RUN_FSLOGGER_FILE		"/run/firejail/mnt/fslogger"
 
 // profiles
-#define DEFAULT_USER_PROFILE	"generic"
+#define DEFAULT_USER_PROFILE	"default"
 #define DEFAULT_ROOT_PROFILE	"server"
 #define MAX_INCLUDE_LEVEL 6		// include levels in profile files
 
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) {
 	int option_force = 0;
 	int custom_profile = 0;	// custom profile loaded
 	char *custom_profile_dir = NULL; // custom profile directory
-	int arg_noprofile = 0; // use generic.profile if none other found/specified
+	int arg_noprofile = 0; // use default.profile if none other found/specified
 #ifdef HAVE_SECCOMP
 	int highest_errno = errno_highest_nr();
 #endif
@@ -1920,7 +1920,7 @@ int main(int argc, char **argv) {
 		}
 	}
 
-	// use generic.profile as the default
+	// use default.profile as the default
 	if (!custom_profile && !arg_noprofile) {
 		if (cfg.chrootdir)
 			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:
 .RS
 $ firejail
 .br
-Reading profile /etc/firejail/generic.profile
+Reading profile /etc/firejail/default.profile
 .br
 Parent pid 8553, child pid 8554
 .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:
 .br
 $ firejail
 .br
-Reading profile /etc/firejail/generic.profile
+Reading profile /etc/firejail/default.profile
 .br
 Parent pid 8553, child pid 8554
 .br
@@ -1786,7 +1786,7 @@ To disable default profile loading, use --noprofile command option. Example:
 .RS
 $ firejail
 .br
-Reading profile /etc/firejail/generic.profile
+Reading profile /etc/firejail/default.profile
 .br
 Parent pid 8553, child pid 8554
 .br
-- 
cgit v1.2.3-54-g00ecf