diff options
author | SkewedZeppelin <8296104+SkewedZeppelin@users.noreply.github.com> | 2019-06-01 07:22:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-01 07:22:11 +0000 |
commit | 02339f0ff6299b9a0f0ef64dec57e10071231029 (patch) | |
tree | 519a8dedc16d5fe3ef89d1e6b3e04d1925225fa4 | |
parent | Fixes for masterpdfeditor.profile (diff) | |
parent | Revert changes to test/profiles/test*.profile: extra whitespace are there to ... (diff) | |
download | firejail-02339f0ff6299b9a0f0ef64dec57e10071231029.tar.gz firejail-02339f0ff6299b9a0f0ef64dec57e10071231029.tar.zst firejail-02339f0ff6299b9a0f0ef64dec57e10071231029.zip |
Merge pull request #2684 from dandelionred/master
Whitespace fix
-rw-r--r-- | etc/Xephyr.profile | 2 | ||||
-rw-r--r-- | etc/Xvfb.profile | 2 | ||||
-rw-r--r-- | etc/baobab.profile | 2 | ||||
-rw-r--r-- | etc/qbittorrent.profile | 2 | ||||
-rw-r--r-- | etc/transmission-daemon.profile | 2 | ||||
-rw-r--r-- | etc/xpra.profile | 2 | ||||
-rw-r--r-- | test/environment/rlimit.profile | 6 |
7 files changed, 9 insertions, 9 deletions
diff --git a/etc/Xephyr.profile b/etc/Xephyr.profile index bce6dc6e6..b4325cd74 100644 --- a/etc/Xephyr.profile +++ b/etc/Xephyr.profile | |||
@@ -7,7 +7,7 @@ include globals.local | |||
7 | 7 | ||
8 | # | 8 | # |
9 | # This profile will sandbox Xephyr server itself when used with firejail --x11=xephyr. | 9 | # This profile will sandbox Xephyr server itself when used with firejail --x11=xephyr. |
10 | # To enable it, create a firejail-Xephyr symlink in /usr/local/bin: | 10 | # To enable it, create a firejail-Xephyr symlink in /usr/local/bin: |
11 | # | 11 | # |
12 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xephyr | 12 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xephyr |
13 | # | 13 | # |
diff --git a/etc/Xvfb.profile b/etc/Xvfb.profile index ed07485d6..b2413ac73 100644 --- a/etc/Xvfb.profile +++ b/etc/Xvfb.profile | |||
@@ -9,7 +9,7 @@ include globals.local | |||
9 | # | 9 | # |
10 | # This profile will sandbox Xvfb server itself when used with firejail --x11=xvfb. | 10 | # This profile will sandbox Xvfb server itself when used with firejail --x11=xvfb. |
11 | # The target program is sandboxed with its own profile. By default the this functionality | 11 | # The target program is sandboxed with its own profile. By default the this functionality |
12 | # is disabled. To enable it, create a firejail-Xvfb symlink in /usr/local/bin: | 12 | # is disabled. To enable it, create a firejail-Xvfb symlink in /usr/local/bin: |
13 | # | 13 | # |
14 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xvfb | 14 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/Xvfb |
15 | # | 15 | # |
diff --git a/etc/baobab.profile b/etc/baobab.profile index fc4e7f268..893865edd 100644 --- a/etc/baobab.profile +++ b/etc/baobab.profile | |||
@@ -33,4 +33,4 @@ private-bin baobab | |||
33 | private-dev | 33 | private-dev |
34 | private-tmp | 34 | private-tmp |
35 | 35 | ||
36 | #memory-deny-write-execute - breaks on Arch | 36 | #memory-deny-write-execute - breaks on Arch |
diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile index b0a6a0016..63810c1d0 100644 --- a/etc/qbittorrent.profile +++ b/etc/qbittorrent.profile | |||
@@ -61,4 +61,4 @@ private-dev | |||
61 | # private-lib - problems on Arch | 61 | # private-lib - problems on Arch |
62 | private-tmp | 62 | private-tmp |
63 | 63 | ||
64 | # memory-deny-write-execute - problems on Arch, see #1690 on GitHub repo | 64 | # memory-deny-write-execute - problems on Arch, see #1690 on GitHub repo |
diff --git a/etc/transmission-daemon.profile b/etc/transmission-daemon.profile index c67200826..9a6052ada 100644 --- a/etc/transmission-daemon.profile +++ b/etc/transmission-daemon.profile | |||
@@ -1,5 +1,5 @@ | |||
1 | # Firejail profile for transmission-daemon | 1 | # Firejail profile for transmission-daemon |
2 | # Description: Fast, easy and free BitTorrent client (daemon) | 2 | # Description: Fast, easy and free BitTorrent client (daemon) |
3 | # This file is overwritten after every install/update | 3 | # This file is overwritten after every install/update |
4 | quiet | 4 | quiet |
5 | # Persistent local customizations | 5 | # Persistent local customizations |
diff --git a/etc/xpra.profile b/etc/xpra.profile index d967c1da2..d58810228 100644 --- a/etc/xpra.profile +++ b/etc/xpra.profile | |||
@@ -8,7 +8,7 @@ include globals.local | |||
8 | 8 | ||
9 | # | 9 | # |
10 | # This profile will sandbox Xpra server itself when used with firejail --x11=xpra. | 10 | # This profile will sandbox Xpra server itself when used with firejail --x11=xpra. |
11 | # To enable it, create a firejail-xpra symlink in /usr/local/bin: | 11 | # To enable it, create a firejail-xpra symlink in /usr/local/bin: |
12 | # | 12 | # |
13 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/xpra | 13 | # $ sudo ln -s /usr/bin/firejail /usr/local/bin/xpra |
14 | # | 14 | # |
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile index a57471604..a569edc6d 100644 --- a/test/environment/rlimit.profile +++ b/test/environment/rlimit.profile | |||
@@ -1,5 +1,5 @@ | |||
1 | rlimit-fsize 1024 | 1 | rlimit-fsize 1024 |
2 | rlimit-nproc 1000 | 2 | rlimit-nproc 1000 |
3 | rlimit-nofile 500 | 3 | rlimit-nofile 500 |
4 | rlimit-sigpending 200 | 4 | rlimit-sigpending 200 |
5 | rlimit-as 123456789012 | 5 | rlimit-as 123456789012 |