Changeset 4807 in /cluster/svnroot


Ignore:
Timestamp:
Jul 16, 2014 3:21:20 PM (6 years ago)
Author:
skylar
Message:

ifdown pre-up causes premature termination (#856)

Location:
bccd-ng/branches/skylar/bccd-3.4.0/trees
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/usr/local/lib/site_perl/Bccd.pm

    r4805 r4807  
    21712171          last HAVE_DHCP;
    21722172      }
    2173     if(!defined($dhcpnic)) {
    2174         $self->log_and_die('ERROR',$sub,"No NIC available for BCCD");
    2175     }
    21762173  }
    2177    
    2178     if(defined($pxenic)) {
    2179         $pxenetip = new NetAddr::IP($self->{nic_conf}->{$pxenic}->{'ipaddr'},
    2180                                                                         $self->{nic_conf}->{$pxenic}->{'mask'}) ||
    2181             $self->log_and_die("ERROR",$sub,"Couldn't create network "
    2182                                 ."IP object for $self->{nic_conf}->{$pxenic}->{'ipaddr'}: $!");
    2183         if(!defined($self->{nic_conf}->{$pxenic}->{'gw'})) {
    2184             $self->{nic_conf}->{$pxenic}->{'gw'}
    2185                                 = $self->{nic_conf}->{$pxenic}->{'ipaddr'};
    2186         }
    2187     }
    2188     $pubnetip=new NetAddr::IP($BCCD_NET->{'ipaddr'},$BCCD_NET->{'mask'}) ||
     2174  if(!defined($dhcpnic)) {
     2175      $self->log_and_die('ERROR',$sub,"No NIC available for BCCD");
     2176  }
     2177
     2178  if(defined($pxenic)) {
     2179      $pxenetip = new NetAddr::IP($self->{nic_conf}->{$pxenic}->{'ipaddr'},
     2180          $self->{nic_conf}->{$pxenic}->{'mask'}) ||
     2181      $self->log_and_die("ERROR",$sub,"Couldn't create network "
     2182          ."IP object for $self->{nic_conf}->{$pxenic}->{'ipaddr'}: $!");
     2183      if(!defined($self->{nic_conf}->{$pxenic}->{'gw'})) {
     2184          $self->{nic_conf}->{$pxenic}->{'gw'}
     2185          = $self->{nic_conf}->{$pxenic}->{'ipaddr'};
     2186      }
     2187  }
     2188  $pubnetip=new NetAddr::IP($BCCD_NET->{'ipaddr'},$BCCD_NET->{'mask'}) ||
    21892189        $self->log_and_die("ERROR",$sub,"Couldn't create network IP object for $BCCD_NET->{'ipaddr'}: $!");
    21902190   
Note: See TracChangeset for help on using the changeset viewer.