aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.md4
-rwxr-xr-xcontrib/syscalls.sh38
-rw-r--r--etc/0ad.profile1
3 files changed, 20 insertions, 23 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ef0484412..c32d898c8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,8 +25,8 @@ A clear and concise description of what you expected to happen.
25 25
26 26
27**Desktop (please complete the following information):** 27**Desktop (please complete the following information):**
28 - Linux distribution and version 28 - Linux distribution and version (ie output of `lsb_release -a`)
29 - Firejail version (output of `firejail --version`) 29 - Firejail version (output of `firejail --version`) exclusive or used git commit (`git rev-parse HEAD`)
30 30
31**Additional context** 31**Additional context**
32Add any other context about the problem here. 32Add any other context about the problem here.
diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh
index c9b5a245a..b990ac23c 100755
--- a/contrib/syscalls.sh
+++ b/contrib/syscalls.sh
@@ -8,26 +8,22 @@ SYSCALLS_OUTPUT_FILE="$(pwd)/syscalls.txt"
8 8
9if [ $# -eq 0 ] 9if [ $# -eq 0 ]
10then 10then
11echo 11 echo
12echo " *** No program specified!!! ***" 12 echo " *** No program specified!!! ***"
13echo 13 echo
14echo -e "Make this file executable and execute it as:\\n" 14 echo -e "Make this file executable and execute it as:\\n"
15echo -e "\\e[96m syscalls.sh /full/path/to/program\\n" 15 echo -e "\\e[96m syscalls.sh /full/path/to/program\\n"
16echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n" 16 echo -e "\\e[39mif you saved this script in a directory in your PATH (e.g., in ${HOME}/bin), otherwise as:\\n"
17echo -e "\\e[96m ./syscalls.sh /full/path/to/program\\n" 17 echo -e "\\e[96m ./syscalls.sh /full/path/to/program\\n"
18echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls." 18 echo -e "\\e[39mUse the full path to the respective program to avoid executing it sandboxed with Firejail\\n(if a Firejail profile for it already exits and 'sudo firecfg' was executed earlier)\\nin order to determine the necessary system calls."
19echo 19 echo
20exit 0 20 exit 0
21
22else 21else
23 22 strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE"
24strace -cfo "$STRACE_OUTPUT_FILE" "$@" && awk '{print $NF}' "$STRACE_OUTPUT_FILE" | sed '/syscall\|-\|total/d' | sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/' > "$SYSCALLS_OUTPUT_FILE" 23 echo
25echo 24 echo -e "\e[39mThese are the sorted syscalls:\n\e[93m"
26echo -e "\e[39mThese are the sorted syscalls:\n\e[93m" 25 cat "$SYSCALLS_OUTPUT_FILE"
27cat "$SYSCALLS_OUTPUT_FILE" 26 echo
28echo 27 echo -e "\e[39mThe sorted syscalls were saved to:\n\e[96m$SYSCALLS_OUTPUT_FILE\n\e[39m"
29echo -e "\e[39mThe sorted syscalls were saved to:\n\n\e[96m$SYSCALLS_OUTPUT_FILE" 28 exit 0
30echo
31exit 0
32
33fi 29fi
diff --git a/etc/0ad.profile b/etc/0ad.profile
index dc3eb5262..6869ea631 100644
--- a/etc/0ad.profile
+++ b/etc/0ad.profile
@@ -24,6 +24,7 @@ whitelist ${HOME}/.cache/0ad
24whitelist ${HOME}/.config/0ad 24whitelist ${HOME}/.config/0ad
25whitelist ${HOME}/.local/share/0ad 25whitelist ${HOME}/.local/share/0ad
26whitelist /usr/share/0ad 26whitelist /usr/share/0ad
27whitelist /usr/share/games
27include whitelist-common.inc 28include whitelist-common.inc
28include whitelist-usr-share-common.inc 29include whitelist-usr-share-common.inc
29include whitelist-var-common.inc 30include whitelist-var-common.inc