diff options
author | netblue30 <netblue30@protonmail.com> | 2022-02-08 10:30:46 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2022-02-08 10:30:46 -0500 |
commit | e90314618b1365aa4964174058dbf0b2378ede41 (patch) | |
tree | 76cef17af48fd3a822eb2ada56609b50fc4e4944 | |
parent | fix --private-cwd, issue #4910 (diff) | |
parent | Refer to firejail.config in configuration files (#4916) (diff) | |
download | firejail-e90314618b1365aa4964174058dbf0b2378ede41.tar.gz firejail-e90314618b1365aa4964174058dbf0b2378ede41.tar.zst firejail-e90314618b1365aa4964174058dbf0b2378ede41.zip |
Merge branch 'master' of ssh://github.com/netblue30/firejail
-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 | ]) |