X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ffiles%2Fdsa-check-libs;h=77b3780594adc1baca8b93b5762855cec846d5c3;hb=20837932686b93b71481bb8ee38c902d06b25fa2;hp=5d4985593159c4c208d1d05d1a0a23796baff654;hpb=940b26bfd05d0768b4ceee585eb478824dfb471b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/files/dsa-check-libs b/modules/nagios/files/dsa-check-libs
index 5d4985593..77b378059 100755
--- a/modules/nagios/files/dsa-check-libs
+++ b/modules/nagios/files/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,8 +171,9 @@ 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\)/);
+		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'}}) {