New upstream version 3.0.12-1upstream/3.0.12-1

1 files changed, 5 insertions, 3 deletions

diff --git a/inxi b/inxi
index 5c9e4c7..a0312b3 100755
--- a/inxi
+++ b/inxi
@@ -31,8 +31,8 @@ use POSIX qw(uname strftime ttyname);
 
 ## INXI INFO ##
 my $self_name='inxi';
-my $self_version='3.0.11';
-my $self_date='2018-06-04';
+my $self_version='3.0.12';
+my $self_date='2018-06-05';
 my $self_patch='00';
 ## END INXI INFO ##
 
@@ -1720,6 +1720,7 @@ sub copy_files {
 		$name = $_;
 		$name =~ s/^\///;
 		$name =~ s/\//~/g;
+		# print "$name\n" if $type eq 'proc';
 		$name = "$directory/$working$name";
 		$good = $name . '.txt';
 		$absent = $name . '-absent';
@@ -1916,8 +1917,9 @@ sub wanted {
 		return if $File::Find::name =~ /^\/proc\/[0-9]+\//;
 		return if $File::Find::name =~ /^\/proc\/bus\/pci\//;
 		return if $File::Find::name =~ /^\/proc\/irq\//;
+		# these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
+		return if $File::Find::name =~ /^\/proc\/k/; 
 		return if $File::Find::name =~ /(\/mb_groups|debug)$/;
-		return if $File::Find::name eq '/proc/kallsyms' || $File::Find::name eq '/proc/keys';
 	}
 	# print $File::Find::name . "\n";
 	push (@content, $File::Find::name);