From ed16bdfdfd98d58c1aab31d17085834b13eea3c8 Mon Sep 17 00:00:00 2001 From: nya1 <16636743+nya1@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:04:43 +0100 Subject: chore: update readme with flag to enable apparmor on ./configure --- README | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index ac614d07c..d0ed610ad 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ $ cd firejail $ ./configure && make && sudo make install-strip On Debian/Ubuntu you will need to install git and gcc compiler. AppArmor -development libraries and pkg-config are required when using --apparmor +development libraries and pkg-config are required when using --enable-apparmor ./configure option: $ sudo apt-get install git build-essential libapparmor-dev pkg-config gawk diff --git a/README.md b/README.md index 21ee88979..163ab4de0 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ $ cd firejail $ ./configure && make && sudo make install-strip ````` On Debian/Ubuntu you will need to install git and gcc compiler. AppArmor -development libraries and pkg-config are required when using `--apparmor` +development libraries and pkg-config are required when using `--enable-apparmor` ./configure option: ````` $ sudo apt-get install git build-essential libapparmor-dev pkg-config gawk -- cgit v1.2.3-54-g00ecf From 36eb222001ca2f53de9e15c5a59d8f2182a9b3e7 Mon Sep 17 00:00:00 2001 From: nya1 <16636743+nya1@users.noreply.github.com> Date: Sat, 14 Jan 2023 16:21:49 +0100 Subject: refactor: do not show apparmor CLI options if app armor is not supported --- src/firejail/usage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/firejail/usage.c b/src/firejail/usage.c index 0a4c8a483..bf4550dd8 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c @@ -30,10 +30,12 @@ static char *usage_str = " -- - signal the end of options and disables further option processing.\n" " --allow-debuggers - allow tools such as strace and gdb inside the sandbox.\n" " --allusers - all user home directories are visible inside the sandbox.\n" +#ifdef HAVE_APPARMOR " --apparmor - enable AppArmor confinement with the default profile.\n" " --apparmor=profile_name - enable AppArmor confinement with a\n" "\tcustom profile.\n" " --apparmor.print=name|pid - print apparmor status.\n" +#endif " --appimage - sandbox an AppImage application.\n" #ifdef HAVE_NETWORK " --bandwidth=name|pid - set bandwidth limits.\n" -- cgit v1.2.3-54-g00ecf