X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-libs;h=77b3780594adc1baca8b93b5762855cec846d5c3;hb=1e02e46c9c9258145b7dee24f4a19b118a3e3436;hp=89d7f3a369b87cc06664471f74f15ea695940d62;hpb=68719522b90a69886d62de048d9cd3440415da1d;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-libs b/dsa-nagios-checks/checks/dsa-check-libs
index 89d7f3a..77b3780 100755
--- a/dsa-nagios-checks/checks/dsa-check-libs
+++ b/dsa-nagios-checks/checks/dsa-check-libs
@@ -53,6 +53,7 @@ if (!GetOptions (
 	'--version'	=> \$params->{'version'},
 	'--quiet'       => \$params->{'quiet'},
 	'--verbose'	=> \$params->{'verbose'},
+	'-v'		=> \$params->{'verbose'},
 	'--config=s'	=> \$params->{'config'},
 	)) {
 	dief ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help|--version] [--verbose] [--quiet] [--config=<CONFIGFILE>]\n");
@@ -170,6 +171,10 @@ LINE: for my $line (@lsof)  {
 	my $inode = $fields{i};
 	my $path  = $fields{n};
 	if ($path =~ m/\.dpkg-/ || $path =~ m/\(deleted\)/ || $path =~ /path inode=/ || $path =~ m#/\.nfs# || $fd eq 'DEL') {
+		my $deleted_in_path = ($path =~ m/\(deleted\)/ || $path =~ m/\.nfs/);
+		next if ($deleted_in_path && $fd =~ /^[0-9]*$/); # Ignore deleted files that are open via normal file handles.
+		next if ($deleted_in_path && $fd eq 'cwd'); # Ignore deleted directories that we happen to be in.
+
 		$path =~ s/^\(deleted\)//; # in some cases "(deleted)" is at the beginning of the string
 		for my $i (@{$config->{'ignorelist'}}) {
 			my $ignore = eval($i);