diff options
author | netblue30 <netblue30@yahoo.com> | 2016-05-04 12:18:50 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-05-04 12:18:50 -0400 |
commit | c3354382c92b386da5ed76f5b12643412a2d32ea (patch) | |
tree | 15dbce7fd053998ffd2c0618ddd3e5694b47c3f4 | |
parent | test fixes (diff) | |
download | firejail-c3354382c92b386da5ed76f5b12643412a2d32ea.tar.gz firejail-c3354382c92b386da5ed76f5b12643412a2d32ea.tar.zst firejail-c3354382c92b386da5ed76f5b12643412a2d32ea.zip |
rename generic.profile as default.profile
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | RELNOTES | 1 | ||||
-rw-r--r-- | etc/default.profile (renamed from etc/generic.profile) | 0 | ||||
-rw-r--r-- | platform/debian/conffiles | 2 | ||||
-rw-r--r-- | src/firejail/firejail.h | 2 | ||||
-rw-r--r-- | src/firejail/main.c | 4 | ||||
-rw-r--r-- | src/man/firejail-profile.txt | 2 | ||||
-rw-r--r-- | src/man/firejail.txt | 4 | ||||
-rwxr-xr-x | test/extract_command.exp | 2 | ||||
-rwxr-xr-x | test/private.exp | 2 |
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: | |||
113 | install -c -m 0644 .etc/vlc.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 113 | install -c -m 0644 .etc/vlc.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
114 | install -c -m 0644 .etc/deluge.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 114 | install -c -m 0644 .etc/deluge.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
115 | install -c -m 0644 .etc/qbittorrent.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 115 | install -c -m 0644 .etc/qbittorrent.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
116 | install -c -m 0644 .etc/generic.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 116 | install -c -m 0644 .etc/default.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
117 | install -c -m 0644 .etc/pidgin.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 117 | install -c -m 0644 .etc/pidgin.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
118 | install -c -m 0644 .etc/xchat.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 118 | install -c -m 0644 .etc/xchat.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
119 | install -c -m 0644 .etc/empathy.profile $(DESTDIR)/$(sysconfdir)/firejail/. | 119 | install -c -m 0644 .etc/empathy.profile $(DESTDIR)/$(sysconfdir)/firejail/. |
@@ -24,6 +24,7 @@ firejail (0.9.40-rc1) baseline; urgency=low | |||
24 | * new profiles: okular, gwenview, Google-Play-Music-Desktop-Player | 24 | * new profiles: okular, gwenview, Google-Play-Music-Desktop-Player |
25 | * new profiles: Aweather, Stellarium, gpredict, quiterss, cyberfox | 25 | * new profiles: Aweather, Stellarium, gpredict, quiterss, cyberfox |
26 | * new profiles: generic Ubuntu snap application profile | 26 | * new profiles: generic Ubuntu snap application profile |
27 | * generic.profile renamed default.profile | ||
27 | * build rpm packages using "make rpms" | 28 | * build rpm packages using "make rpms" |
28 | * bugfixes | 29 | * bugfixes |
29 | -- netblue30 <netblue30@yahoo.com> Sun, 3 Apr 2016 08:00:00 -0500 | 30 | -- 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 @@ | |||
27 | /etc/firejail/totem.profile | 27 | /etc/firejail/totem.profile |
28 | /etc/firejail/deluge.profile | 28 | /etc/firejail/deluge.profile |
29 | /etc/firejail/qbittorrent.profile | 29 | /etc/firejail/qbittorrent.profile |
30 | /etc/firejail/generic.profile | 30 | /etc/firejail/default.profile |
31 | /etc/firejail/xchat.profile | 31 | /etc/firejail/xchat.profile |
32 | /etc/firejail/server.profile | 32 | /etc/firejail/server.profile |
33 | /etc/firejail/quassel.profile | 33 | /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 @@ | |||
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 |
47 | Reading profile /etc/firejail/generic.profile | 47 | Reading profile /etc/firejail/default.profile |
48 | .br | 48 | .br |
49 | Parent pid 8553, child pid 8554 | 49 | Parent 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 |
871 | Reading profile /etc/firejail/generic.profile | 871 | Reading profile /etc/firejail/default.profile |
872 | .br | 872 | .br |
873 | Parent pid 8553, child pid 8554 | 873 | Parent 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 |
1789 | Reading profile /etc/firejail/generic.profile | 1789 | Reading profile /etc/firejail/default.profile |
1790 | .br | 1790 | .br |
1791 | Parent pid 8553, child pid 8554 | 1791 | Parent pid 8553, child pid 8554 |
1792 | .br | 1792 | .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 | |||
7 | send -- "firejail --debug ls -al\r" | 7 | send -- "firejail --debug ls -al\r" |
8 | expect { | 8 | expect { |
9 | timeout {puts "TESTING ERROR 0\n";exit} | 9 | timeout {puts "TESTING ERROR 0\n";exit} |
10 | "Reading profile /etc/firejail/generic.profile" | 10 | "Reading profile /etc/firejail/default.profile" |
11 | } | 11 | } |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 2\n";exit} | 13 | 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 } { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | # testing profile and private | 14 | # testing profile and private |
15 | send -- "firejail --private --profile=/etc/firejail/generic.profile\r" | 15 | send -- "firejail --private --profile=/etc/firejail/default.profile\r" |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 0\n";exit} | 17 | timeout {puts "TESTING ERROR 0\n";exit} |
18 | "Child process initialized" | 18 | "Child process initialized" |