From f3d548ca370c32c1df97628a2117cd79aae6f710 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Thu, 19 Jan 2023 07:56:13 -0500 Subject: cleanup --- etc/profile-a-l/dig.profile | 2 +- etc/profile-a-l/host.profile | 2 +- etc/profile-m-z/nslookup.profile | 2 +- test/fs/whitelist-dev.exp | 2 +- test/fs/whitelist.exp | 2 +- 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 disable-mnt private-bin bash,dig,sh private-dev -private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf +private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf # Add the next line to your dig.local on non Debian/Ubuntu OS (see issue #3038). #private-lib 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 disable-mnt private private-bin bash,host,sh -private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf +private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf private-dev private-tmp 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 disable-mnt private-bin bash,nslookup,sh -private-etc alternatives,ld.so.conf.d,ld.so.preload,login.defs,passwd,resolv.conf +private-etc alternatives,ld.so.cache,ld.so.preload,login.defs,passwd,resolv.conf private-dev private-tmp 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 send -- "exit\r" sleep 1 -send -- "firejail --private-dev --debug\r" +send -- "firejail --private-dev\r" expect { timeout {puts "TESTING ERROR 4\n";exit} -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 send -- "ln -s ~/fjtest-dir ~/fjtest-dir-lnk\r" after 200 -send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir --debug\r" +send -- "firejail --whitelist=~/fjtest-file --whitelist=~/fjtest-dir\r" expect { timeout {puts "TESTING ERROR 0\n";exit} -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 send -- "firejail man firejail\r" expect { timeout {puts "TESTING ERROR 0\n";exit} + "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit} + "Press RETURN to continue" {puts "TESTING SKIP 1.2\n";exit} "NAME" } -expect { - timeout {puts "TESTING ERROR 0\n";exit} - "SYNOPSIS" -} after 100 puts "\nall done\n" -- cgit v1.2.3-70-g09d2