diff options
author | 2022-02-08 14:31:36 +0000 | |
---|---|---|
committer | 2022-02-08 14:31:36 +0000 | |
commit | ad56b37c723c4991577b66eda90a7fe618fc58cd (patch) | |
tree | 44236da1275ec2d06869dd0345266d14735d25aa | |
parent | Merge pull request #4912 from netblue30/ci_centos (diff) | |
download | firejail-ad56b37c723c4991577b66eda90a7fe618fc58cd.tar.gz firejail-ad56b37c723c4991577b66eda90a7fe618fc58cd.tar.zst firejail-ad56b37c723c4991577b66eda90a7fe618fc58cd.zip |
Refer to firejail.config in configuration files (#4916)
* fix globalcfg help string
* fix --disable-globalcfg explanation
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1380,7 +1380,7 @@ Optional Features: | |||
1380 | --disable-firetunnel disable firetunnel | 1380 | --disable-firetunnel disable firetunnel |
1381 | --disable-private-home disable private home feature | 1381 | --disable-private-home disable private home feature |
1382 | --disable-chroot disable chroot | 1382 | --disable-chroot disable chroot |
1383 | --disable-globalcfg if the global config file firejail.cfg is not | 1383 | --disable-globalcfg if the global config file firejail.config is not |
1384 | present, continue the program using defaults | 1384 | present, continue the program using defaults |
1385 | --disable-network disable network | 1385 | --disable-network disable network |
1386 | --disable-userns disable user namespace | 1386 | --disable-userns disable user namespace |
diff --git a/configure.ac b/configure.ac index 3fd300970..042741d2c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -150,7 +150,7 @@ HAVE_GLOBALCFG="" | |||
150 | AC_SUBST([HAVE_GLOBALCFG]) | 150 | AC_SUBST([HAVE_GLOBALCFG]) |
151 | AC_ARG_ENABLE([globalcfg], | 151 | AC_ARG_ENABLE([globalcfg], |
152 | [AS_HELP_STRING([--disable-globalcfg], | 152 | [AS_HELP_STRING([--disable-globalcfg], |
153 | [if the global config file firejail.cfg is not present, continue the program using defaults])]) | 153 | [if the global config file firejail.config is not present, continue the program using defaults])]) |
154 | AS_IF([test "x$enable_globalcfg" != "xno"], [ | 154 | AS_IF([test "x$enable_globalcfg" != "xno"], [ |
155 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" | 155 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" |
156 | ]) | 156 | ]) |