diff options
author | netblue30 <netblue30@protonmail.com> | 2023-01-19 07:56:13 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2023-01-19 07:56:13 -0500 |
commit | f3d548ca370c32c1df97628a2117cd79aae6f710 (patch) | |
tree | 1e36d0492f380b6ae7636ddbf296492c825f7775 | |
parent | cleanup (diff) | |
download | firejail-f3d548ca370c32c1df97628a2117cd79aae6f710.tar.gz firejail-f3d548ca370c32c1df97628a2117cd79aae6f710.tar.zst firejail-f3d548ca370c32c1df97628a2117cd79aae6f710.zip |
cleanup
-rw-r--r-- | etc/profile-a-l/dig.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/host.profile | 2 | ||||
-rw-r--r-- | etc/profile-m-z/nslookup.profile | 2 | ||||
-rwxr-xr-x | test/fs/whitelist-dev.exp | 2 | ||||
-rwxr-xr-x | test/fs/whitelist.exp | 2 | ||||
-rwxr-xr-x | test/sysutils/man.exp | 6 |
6 files changed, 7 insertions, 9 deletions
diff --git a/etc/profile-a-l/dig.profile b/etc/profile-a-l/dig.profile index abd3f772c..3ee58147a 100644 --- a/etc/profile-a-l/dig.profile +++ b/etc/profile-a-l/dig.profile | |||
@@ -48,7 +48,7 @@ tracelog | |||
48 | disable-mnt | 48 | disable-mnt |
49 | private-bin bash,dig,sh | 49 | private-bin bash,dig,sh |
50 | private-dev | 50 | private-dev |
51 | private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf | 51 | private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf |
52 | # Add the next line to your dig.local on non Debian/Ubuntu OS (see issue #3038). | 52 | # Add the next line to your dig.local on non Debian/Ubuntu OS (see issue #3038). |
53 | #private-lib | 53 | #private-lib |
54 | private-tmp | 54 | private-tmp |
diff --git a/etc/profile-a-l/host.profile b/etc/profile-a-l/host.profile index ea70d36fa..b33709ef0 100644 --- a/etc/profile-a-l/host.profile +++ b/etc/profile-a-l/host.profile | |||
@@ -42,7 +42,7 @@ tracelog | |||
42 | disable-mnt | 42 | disable-mnt |
43 | private | 43 | private |
44 | private-bin bash,host,sh | 44 | private-bin bash,host,sh |
45 | private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf | 45 | private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf |
46 | private-dev | 46 | private-dev |
47 | private-tmp | 47 | private-tmp |
48 | 48 | ||
diff --git a/etc/profile-m-z/nslookup.profile b/etc/profile-m-z/nslookup.profile index ba6e693be..5866cda47 100644 --- a/etc/profile-m-z/nslookup.profile +++ b/etc/profile-m-z/nslookup.profile | |||
@@ -45,7 +45,7 @@ tracelog | |||
45 | 45 | ||
46 | disable-mnt | 46 | disable-mnt |
47 | private-bin bash,nslookup,sh | 47 | private-bin bash,nslookup,sh |
48 | private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf | 48 | private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf |
49 | private-dev | 49 | private-dev |
50 | private-tmp | 50 | private-tmp |
51 | 51 | ||
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp index 049698b99..fb91c4678 100755 --- a/test/fs/whitelist-dev.exp +++ b/test/fs/whitelist-dev.exp | |||
@@ -39,7 +39,7 @@ after 100 | |||
39 | send -- "exit\r" | 39 | send -- "exit\r" |
40 | sleep 1 | 40 | sleep 1 |
41 | 41 | ||
42 | send -- "firejail --private-dev --debug\r" | 42 | send -- "firejail --private-dev\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 4\n";exit} | 44 | timeout {puts "TESTING ERROR 4\n";exit} |
45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | 45 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp index 8e98b9dfa..f35744a9c 100755 --- a/test/fs/whitelist.exp +++ b/test/fs/whitelist.exp | |||
@@ -33,7 +33,7 @@ after 200 | |||
33 | send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r" | 33 | send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r" |
34 | after 200 | 34 | after 200 |
35 | 35 | ||
36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" | 36 | send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir\r" |
37 | expect { | 37 | expect { |
38 | timeout {puts "TESTING ERROR 0\n";exit} | 38 | timeout {puts "TESTING ERROR 0\n";exit} |
39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" | 39 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
diff --git a/test/sysutils/man.exp b/test/sysutils/man.exp index e5dd83522..a263180b5 100755 --- a/test/sysutils/man.exp +++ b/test/sysutils/man.exp | |||
@@ -10,11 +10,9 @@ match_max 100000 | |||
10 | send -- "firejail man firejail\r" | 10 | send -- "firejail man firejail\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit} | ||
14 | "Press RETURN to continue" {puts "TESTING SKIP 1.2\n";exit} | ||
13 | "NAME" | 15 | "NAME" |
14 | } | 16 | } |
15 | expect { | ||
16 | timeout {puts "TESTING ERROR 0\n";exit} | ||
17 | "SYNOPSIS" | ||
18 | } | ||
19 | after 100 | 17 | after 100 |
20 | puts "\nall done\n" | 18 | puts "\nall done\n" |