Merge branch 'master' of https://github.com/netblue30/firejail

2 files changed, 4 insertions, 1 deletions

diff --git a/etc/firejail-default b/etc/firejail-default
index 3542d9bc9..09dc896e6 100644
--- a/etc/firejail-default
+++ b/etc/firejail-default
@@ -10,7 +10,7 @@
 ##########
 @{PID}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9]}
 
-profile /etc/apparmor.d/firejail-default flags=(attach_disconnected,mediate_deleted) {
+profile firejail-default flags=(attach_disconnected,mediate_deleted) {
 
 ##########
 # Allow D-Bus access. It may negatively affect security. Comment those lines or
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 6fe220d35..d79b8bb8e 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -161,6 +161,9 @@ static void set_file(const char *name, const char *firejail_exec) {
                 else
                         printf("   %s created\n", name);
         }
+        else {
+          fprintf(stderr, "Warning: cannot create %s - already exists! Skipping...\n", fname);
+        }
 
         free(fname);
 }