10 files changed, 11 insertions, 10 deletions

diff --git a/Makefile.in b/Makefile.in
index 39766a8b0..92254fbc0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,7 +113,7 @@ realinstall:
         install -c -m 0644 .etc/vlc.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/deluge.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/qbittorrent.profile $(DESTDIR)/$(sysconfdir)/firejail/.
-        install -c -m 0644 .etc/generic.profile $(DESTDIR)/$(sysconfdir)/firejail/.
+        install -c -m 0644 .etc/default.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/pidgin.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/xchat.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/empathy.profile $(DESTDIR)/$(sysconfdir)/firejail/.
diff --git a/RELNOTES b/RELNOTES
index b6304249f..8ccbeed0d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -24,6 +24,7 @@ firejail (0.9.40-rc1) baseline; urgency=low
   * new profiles: okular, gwenview, Google-Play-Music-Desktop-Player
   * new profiles: Aweather, Stellarium, gpredict, quiterss, cyberfox
   * new profiles: generic Ubuntu snap application profile
+  * generic.profile renamed default.profile
   * build rpm packages using "make rpms"
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Sun, 3 Apr 2016 08:00:00 -0500
diff --git a/etc/generic.profile b/etc/default.profile
index f2c7d4114..f2c7d4114 100644
--- a/etc/generic.profile
+++ b/etc/default.profile
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 11d583ec3..109af24d7 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -27,7 +27,7 @@
 /etc/firejail/totem.profile
 /etc/firejail/deluge.profile
 /etc/firejail/qbittorrent.profile
-/etc/firejail/generic.profile
+/etc/firejail/default.profile
 /etc/firejail/xchat.profile
 /etc/firejail/server.profile
 /etc/firejail/quassel.profile
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
diff --git a/test/extract_command.exp b/test/extract_command.exp
index 99c1cc134..851b793c9 100755
--- a/test/extract_command.exp
+++ b/test/extract_command.exp
@@ -7,7 +7,7 @@ match_max 100000
 send -- "firejail --debug ls -al\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
-        "Reading profile /etc/firejail/generic.profile"
+        "Reading profile /etc/firejail/default.profile"
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
diff --git a/test/private.exp b/test/private.exp
index a5920c37b..80a921529 100755
--- a/test/private.exp
+++ b/test/private.exp
@@ -12,7 +12,7 @@ if { $argc != 1 } {
 }
 
 # testing profile and private
-send -- "firejail --private --profile=/etc/firejail/generic.profile\r"
+send -- "firejail --private --profile=/etc/firejail/default.profile\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"