aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/profile-a-l/dig.profile2
-rw-r--r--etc/profile-a-l/host.profile2
-rw-r--r--etc/profile-m-z/nslookup.profile2
-rwxr-xr-xtest/fs/whitelist-dev.exp2
-rwxr-xr-xtest/fs/whitelist.exp2
-rwxr-xr-xtest/sysutils/man.exp6
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
48disable-mnt 48disable-mnt
49private-bin bash,dig,sh 49private-bin bash,dig,sh
50private-dev 50private-dev
51private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf 51private-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
54private-tmp 54private-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
42disable-mnt 42disable-mnt
43private 43private
44private-bin bash,host,sh 44private-bin bash,host,sh
45private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf 45private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf
46private-dev 46private-dev
47private-tmp 47private-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
46disable-mnt 46disable-mnt
47private-bin bash,nslookup,sh 47private-bin bash,nslookup,sh
48private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf 48private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf
49private-dev 49private-dev
50private-tmp 50private-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
39send -- "exit\r" 39send -- "exit\r"
40sleep 1 40sleep 1
41 41
42send -- "firejail --private-dev --debug\r" 42send -- "firejail --private-dev\r"
43expect { 43expect {
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
33send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r" 33send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r"
34after 200 34after 200
35 35
36send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" 36send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir\r"
37expect { 37expect {
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
10send -- "firejail man firejail\r" 10send -- "firejail man firejail\r"
11expect { 11expect {
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}
15expect {
16 timeout {puts "TESTING ERROR 0\n";exit}
17 "SYNOPSIS"
18}
19after 100 17after 100
20puts "\nall done\n" 18puts "\nall done\n"