aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2023-07-19 12:54:53 +0000
committerLibravatar GitHub <noreply@github.com>2023-07-19 12:54:53 +0000
commit9863f982ca148f687a56690e2aeed10014d05e59 (patch)
tree4bb5bddc7a92a66564031f61d67abe2d4a347500 /etc
parentzsh: add shell completion for --tab (diff)
downloadfirejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.gz
firejail-9863f982ca148f687a56690e2aeed10014d05e59.tar.zst
firejail-9863f982ca148f687a56690e2aeed10014d05e59.zip
modif: drop deprecated 'shell' option references (#5894)
The `shell` option has been removed. Remove stale references. This does NOT remove `shell none`-related code comments in: - src/firejail/fs_lib.c (L433-L441) - src/firejail/join.c (L415-L417) Relates to #5196. Suggested by #5891.
Diffstat (limited to 'etc')
-rw-r--r--etc/profile-a-l/beaker.profile1
-rw-r--r--etc/profile-a-l/default.profile1
-rw-r--r--etc/profile-a-l/fdns.profile1
-rw-r--r--etc/profile-a-l/gnome-nettool.profile1
-rw-r--r--etc/profile-a-l/jitsi-meet-desktop.profile1
-rw-r--r--etc/profile-m-z/pidgin.profile1
-rw-r--r--etc/profile-m-z/rocketchat.profile1
-rw-r--r--etc/profile-m-z/server.profile1
-rw-r--r--etc/templates/profile.template3
9 files changed, 1 insertions, 10 deletions
diff --git a/etc/profile-a-l/beaker.profile b/etc/profile-a-l/beaker.profile
index ff21b7ee5..85c1bdec1 100644
--- a/etc/profile-a-l/beaker.profile
+++ b/etc/profile-a-l/beaker.profile
@@ -13,7 +13,6 @@ ignore include whitelist-usr-share-common.inc
13ignore include whitelist-var-common.inc 13ignore include whitelist-var-common.inc
14ignore nou2f 14ignore nou2f
15ignore novideo 15ignore novideo
16ignore shell none
17ignore disable-mnt 16ignore disable-mnt
18ignore private-cache 17ignore private-cache
19ignore private-dev 18ignore private-dev
diff --git a/etc/profile-a-l/default.profile b/etc/profile-a-l/default.profile
index a10bbab5b..41794d173 100644
--- a/etc/profile-a-l/default.profile
+++ b/etc/profile-a-l/default.profile
@@ -40,7 +40,6 @@ notv
40novideo 40novideo
41protocol unix,inet,inet6 41protocol unix,inet,inet6
42seccomp 42seccomp
43# shell none
44# tracelog 43# tracelog
45 44
46# disable-mnt 45# disable-mnt
diff --git a/etc/profile-a-l/fdns.profile b/etc/profile-a-l/fdns.profile
index 4dbf3c194..fe7f88a75 100644
--- a/etc/profile-a-l/fdns.profile
+++ b/etc/profile-a-l/fdns.profile
@@ -36,7 +36,6 @@ nou2f
36novideo 36novideo
37protocol unix,inet,inet6,netlink 37protocol unix,inet,inet6,netlink
38#seccomp 38#seccomp
39#shell none
40 39
41disable-mnt 40disable-mnt
42private 41private
diff --git a/etc/profile-a-l/gnome-nettool.profile b/etc/profile-a-l/gnome-nettool.profile
index ce4e5edd8..7a9a0e336 100644
--- a/etc/profile-a-l/gnome-nettool.profile
+++ b/etc/profile-a-l/gnome-nettool.profile
@@ -35,7 +35,6 @@ notv
35nou2f 35nou2f
36novideo 36novideo
37#seccomp 37#seccomp
38#shell none
39 38
40disable-mnt 39disable-mnt
41private 40private
diff --git a/etc/profile-a-l/jitsi-meet-desktop.profile b/etc/profile-a-l/jitsi-meet-desktop.profile
index bc2c33cfb..cc6fd2114 100644
--- a/etc/profile-a-l/jitsi-meet-desktop.profile
+++ b/etc/profile-a-l/jitsi-meet-desktop.profile
@@ -9,7 +9,6 @@ include globals.local
9# Disabled until someone reported positive feedback 9# Disabled until someone reported positive feedback
10ignore nou2f 10ignore nou2f
11ignore novideo 11ignore novideo
12ignore shell none
13 12
14ignore noexec /tmp 13ignore noexec /tmp
15 14
diff --git a/etc/profile-m-z/pidgin.profile b/etc/profile-m-z/pidgin.profile
index d78478687..a852a2a18 100644
--- a/etc/profile-m-z/pidgin.profile
+++ b/etc/profile-m-z/pidgin.profile
@@ -38,7 +38,6 @@ notv
38nou2f 38nou2f
39protocol unix,inet,inet6,netlink 39protocol unix,inet,inet6,netlink
40seccomp 40seccomp
41# shell none
42tracelog 41tracelog
43 42
44# private-bin pidgin 43# private-bin pidgin
diff --git a/etc/profile-m-z/rocketchat.profile b/etc/profile-m-z/rocketchat.profile
index bad384090..a95cc18d7 100644
--- a/etc/profile-m-z/rocketchat.profile
+++ b/etc/profile-m-z/rocketchat.profile
@@ -15,7 +15,6 @@ ignore include whitelist-usr-share-common.inc
15ignore include whitelist-var-common.inc 15ignore include whitelist-var-common.inc
16ignore nou2f 16ignore nou2f
17ignore novideo 17ignore novideo
18ignore shell none
19ignore disable-mnt 18ignore disable-mnt
20ignore private-cache 19ignore private-cache
21ignore private-dev 20ignore private-dev
diff --git a/etc/profile-m-z/server.profile b/etc/profile-m-z/server.profile
index 05170267b..667f9c557 100644
--- a/etc/profile-m-z/server.profile
+++ b/etc/profile-m-z/server.profile
@@ -70,7 +70,6 @@ nou2f
70novideo 70novideo
71protocol unix,inet,inet6,netlink,packet 71protocol unix,inet,inet6,netlink,packet
72seccomp 72seccomp
73# shell none
74tab # allow tab completion 73tab # allow tab completion
75 74
76disable-mnt 75disable-mnt
diff --git a/etc/templates/profile.template b/etc/templates/profile.template
index b88566f54..9329fe297 100644
--- a/etc/templates/profile.template
+++ b/etc/templates/profile.template
@@ -31,7 +31,7 @@
31# MKDIRS 31# MKDIRS
32# WHITELISTS 32# WHITELISTS
33# WHITELIST INCLUDES 33# WHITELIST INCLUDES
34# OPTIONS (caps*, net*, no*, protocol, seccomp*, shell none, tracelog) 34# OPTIONS (caps*, net*, no*, protocol, seccomp*, tracelog)
35# PRIVATE OPTIONS (disable-mnt, private-*, writable-*) 35# PRIVATE OPTIONS (disable-mnt, private-*, writable-*)
36# DBUS FILTER 36# DBUS FILTER
37# SPECIAL OPTIONS (mdwx, noexec, read-only, join-or-start) 37# SPECIAL OPTIONS (mdwx, noexec, read-only, join-or-start)
@@ -172,7 +172,6 @@ include globals.local
172##seccomp.drop SYSCALLS (see syscalls.txt) 172##seccomp.drop SYSCALLS (see syscalls.txt)
173#seccomp.block-secondary 173#seccomp.block-secondary
174##seccomp-error-action log (only for debugging seccomp issues) 174##seccomp-error-action log (only for debugging seccomp issues)
175#shell none
176#tracelog 175#tracelog
177# Prefer 'x11 none' instead of 'disable-X11.inc' if 'net none' is set 176# Prefer 'x11 none' instead of 'disable-X11.inc' if 'net none' is set
178##x11 none 177##x11 none