4 files changed, 1 insertions, 7 deletions

diff --git a/src/bash_completion/firejail.bash_completion.in b/src/bash_completion/firejail.bash_completion.in
index ff411c807..8e047ce90 100644
--- a/src/bash_completion/firejail.bash_completion.in
+++ b/src/bash_completion/firejail.bash_completion.in
@@ -42,10 +42,6 @@ _firejail()
             _filedir -d
             return 0
             ;;
-        --cgroup)
-            _filedir -d
-            return 0
-            ;;
         --tmpfs)
             _filedir
             return 0
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 7e05fc785..b47089b0e 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -414,7 +414,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
         if (!arg_shell_none)
                 shfd = open_shell();
 
-        // in user mode set caps seccomp, cpu, cgroup, etc
+        // in user mode set caps seccomp, cpu etc.
         if (getuid() != 0) {
                 extract_nonewprivs(sandbox);  // redundant on Linux >= 4.10; duplicated in function extract_caps
                 extract_caps(sandbox);
diff --git a/src/include/rundefs.h b/src/include/rundefs.h
index 2f6b47461..08042d2c4 100644
--- a/src/include/rundefs.h
+++ b/src/include/rundefs.h
@@ -37,7 +37,6 @@
 #define RUN_RO_DIR                      RUN_FIREJAIL_DIR "/firejail.ro.dir"
 #define RUN_RO_FILE                     RUN_FIREJAIL_DIR "/firejail.ro.file"
 #define RUN_MNT_DIR                     RUN_FIREJAIL_DIR "/mnt" // a tmpfs is mounted on this directory before any of the files below are created
-#define RUN_CGROUP_CFG                  RUN_MNT_DIR "/cgroup"
 #define RUN_CPU_CFG                     RUN_MNT_DIR "/cpu"
 #define RUN_GROUPS_CFG                  RUN_MNT_DIR "/groups"
 #define RUN_PROTOCOL_CFG                RUN_MNT_DIR "/protocol"
diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in
index f7cd3cdff..8383d83d3 100644
--- a/src/zsh_completion/_firejail.in
+++ b/src/zsh_completion/_firejail.in
@@ -91,7 +91,6 @@ _firejail_args=(
     '--caps.drop=all[drop all capabilities]'
     '*--caps.drop=-[drop capabilities: all|cap1,cap2,...]: :_caps'
     '*--caps.keep=-[keep capabilities: cap1,cap2,...]: :_caps'
-    '--cgroup=-[place the sandbox in the specified control group]: :'
     '--cpu=-[set cpu affinity]: :->cpus'
     "--deterministic-exit-code[always exit with first child's status code]"
     '--deterministic-shutdown[terminate orphan processes]'