/[fai]/people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm
ViewVC logotype

Diff of /people/michael/features/setup_harddisks_2/implementation/lib/sizes.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4865 by mt, Tue Apr 8 19:50:23 2008 UTC revision 4866 by mt, Wed Apr 9 12:45:38 2008 UTC
# Line 105  sub estimate_size { Line 105  sub estimate_size {
105    }    }
106    
107    # try a partition    # try a partition
108    elsif ($dev =~ m{^(/dev/i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t])p?(\d+)$}) {    elsif ($dev =~ m{^(/dev/(i2o/hd[a-t]|cciss/c\dd\d|ida/c\dd\d|rd/c\dd\d|ataraid/d\d|sd[a-t]|hd[a-t]))p?(\d+)$}) {
109    
110      # the size is configured, return it      # the size is configured, return it
111      defined ($FAI::configs{"PHY_$1"}{partitions}{$2}{size}{eff_size})      defined ($FAI::configs{"PHY_$1"}{partitions}{$3}{size}{eff_size})
112        and return $FAI::configs{"PHY_$1"}{partitions}{$2}{size}{eff_size} /        and return $FAI::configs{"PHY_$1"}{partitions}{$3}{size}{eff_size} /
113        (1024 * 1024);        (1024 * 1024);
114    
115      # the size is known from the current configuration on disk, return it      # the size is known from the current configuration on disk, return it
116      defined ($FAI::current_config{$1}{partitions}{$2}{count_byte})      defined ($FAI::current_config{$1}{partitions}{$3}{count_byte})
117        and return $FAI::current_config{$1}{partitions}{$2}{count_byte} /        and return $FAI::current_config{$1}{partitions}{$3}{count_byte} /
118        (1024 * 1024);        (1024 * 1024);
119    
120      # the size is not known (yet?)      # the size is not known (yet?)
Legend:
Removed from v.4865  
changed lines
  Added in v.4866
  ViewVC Help
Powered by ViewVC 1.1.5