xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

modify depending on comments

Browse Source
This commit is contained in:
hu-weihua 2016-11-04 03:19:38 -04:00
parent 2751a075b6
commit 0a0615139c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-probe/subcmds/xcatmn
View File

@ -498,11 +498,11 @@ sub check_disk {
my %dir_expectedspace_list = ("/var" => 1, "/tmp" => 1, "/install" => 10);
my %mountpointinfo;
foreach my $dir (keys %dir_expectedspace_list) {
my $output = `df -k $dir|tail -n 1`;
my $output = `df --block-size=1G $dir|tail -n 1`;
chomp($output);
my @splitoutput = split(" ", $output);
$mountpointinfo{ $splitoutput[5] }{available} = $splitoutput[3];
$mountpointinfo{ $splitoutput[5] }{need} += $dir_expectedspace_list{$dir} * 1048576;
$mountpointinfo{ $splitoutput[5] }{need} += $dir_expectedspace_list{$dir};
push @{ $mountpointinfo{ $splitoutput[5] }{mount} }, $dir;
}
@ -512,8 +512,7 @@ sub check_disk {
foreach (@{ $mountpointinfo{$mountpoint}{mount} }) {
$msg .= "'$_' needs $dir_expectedspace_list{$_} G, ";
}
my $size_g = $mountpointinfo{$mountpoint}{available} / 1048576;
$msg .= "These directories are mounted on '$mountpoint', the free space of '$mountpoint' is $size_g G, it isn't enough.";
$msg .= "These directories are mounted on '$mountpoint', the free space of '$mountpoint' is $mountpointinfo{$mountpoint}{available} G, it isn't enough.";
$rst = 1;
}
}