--- rancid-original	2006-06-06 14:23:42.000000000 +0200
+++ rancid	2008-06-19 08:39:53.000000000 +0200
@@ -665,6 +665,8 @@
 	return(-1) if /(: device being squeezed|ATA_Status time out)/i; # busy
 	return(-1) if (/command authorization failed/i);
 	return(1) if /(Open device \S+ failed|Error opening \S+:)/;
+	s/\d+ bytes total \(\d+ bytes free\)/ <CRS harddisks sizes skipped> / if ($type =~ /CRS/ and $cmd =~ /(harddisk|bootflash)/);
+	s/.*(uptime|temp)_cont/! <CRS constantly changing $1_cont skipped> / if ($type =~ /CRS/ and $cmd =~ /(harddisk|bootflash)/);
 	# the pager can not be disabled per-session on the PIX
 	if (/^(<-+ More -+>)/) {
 	    my($len) = length($1);
@@ -1610,7 +1612,7 @@
 	    if (defined($ENV{'NOCOMMSTR'})) {
 		my($ip) = $1;
 		my($line) = "snmp-server host $ip";
-		my(@tokens) = split(' ', $');
+		my(@tokens) = split(' ', $');  #' (This comment fixes emacs fontification)
 		my($token);
 		while ($token = shift(@tokens)) {
 		    if ($token eq 'version') {
@@ -1753,7 +1755,7 @@
 	{'show controllers'		=> 'ShowContAll'},
 	{'show controllers cbus'	=> 'ShowContCbus'},
 	{'show diagbus'			=> 'ShowDiagbus'},
-	{'admin show diag'		=> 'ShowDiag'},
+	{'run show_diag admin'		=> 'ShowDiag'},
 	{'show diag'			=> 'ShowDiag'},
 	{'show module'			=> 'ShowModule'},	# cat 6500-ios
 	{'show spe version'		=> 'ShowSpeVersion'},