Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 281087 | Differences between
and this patch

Collapse All | Expand All

(-)monitorix.pl.orig (-1 / +9 lines)
Lines 81-86 Link Here
81
our @PC_MAIL;
81
our @PC_MAIL;
82
our $IPTABLES;
82
our $IPTABLES;
83
our $PVS = "pvs";
83
our $PVS = "pvs";
84
our $EVMS = "evms_query";
84
85
85
# The current two locations where the configuration file can reside.
86
# The current two locations where the configuration file can reside.
86
if(-f "/etc/monitorix.conf") {
87
if(-f "/etc/monitorix.conf") {
Lines 1069-1075 Link Here
1069
	my @monthlist = ("Desembre",
1070
	my @monthlist = ("Desembre",
1070
	   		"Gener",
1071
	   		"Gener",
1071
	   		"Febrer",
1072
	   		"Febrer",
1072
	   		"Març",
1073
	   		"Març",
1073
	   		"Abril",
1074
	   		"Abril",
1074
	   		"Maig",
1075
	   		"Maig",
1075
	   		"Juny",
1076
	   		"Juny",
Lines 3038-3043 Link Here
3038
		my $lvm_disk;
3039
		my $lvm_disk;
3039
		my $is_cciss;
3040
		my $is_cciss;
3040
		my $is_md;
3041
		my $is_md;
3042
		my $found = 0;
3041
	
3043
	
3042
		$root_disk = `df -P / | grep / | awk -F " " '{ print \$1 }'`;
3044
		$root_disk = `df -P / | grep / | awk -F " " '{ print \$1 }'`;
3043
		chomp($root_disk);
3045
		chomp($root_disk);
Lines 3048-3053 Link Here
3048
			$root_disk =~ s/.$//;
3050
			$root_disk =~ s/.$//;
3049
			$is_cciss = 1;
3051
			$is_cciss = 1;
3050
		}
3052
		}
3053
		if($root_disk =~ m/\/dev\/evms\//) {
3054
			$root_disk = `$EVMS disks $root_disk`;
3055
			$found = 1;
3056
		}
3057
		if(!$found) {
3051
		if(stat("/proc/mdstat")) {
3058
		if(stat("/proc/mdstat")) {
3052
			my $tmp;
3059
			my $tmp;
3053
			my $md_root_disk = $root_disk;
3060
			my $md_root_disk = $root_disk;
Lines 3100-3105 Link Here
3100
			}
3107
			}
3101
3108
3102
		}
3109
		}
3110
		}
3103
	}
3111
	}
3104
3112
3105
	chomp($ROOT_TOTAL,
3113
	chomp($ROOT_TOTAL,

Return to bug 281087