Author: mvidner
Date: Wed Aug 31 16:50:53 2011
New Revision: 65482
URL: http://svn.opensuse.org/viewcvs/yast?rev=65482&view=rev
Log:
YaPI::NETWORK::Write: Allow omitting IPADDR.
Author: Justus Winter
Modified:
trunk/network/src/lan/YaPI/NETWORK.pm
Modified: trunk/network/src/lan/YaPI/NETWORK.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?rev=65482&r1=65481&r2=65482&view=diff
==============================================================================
--- trunk/network/src/lan/YaPI/NETWORK.pm (original)
+++ trunk/network/src/lan/YaPI/NETWORK.pm Wed Aug 31 16:50:53 2011
@@ -142,20 +142,20 @@
NetworkInterfaces->Read();
NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev);
NetworkInterfaces->Name($dev);
- my $ip = $ifc->{'ipaddr'};
- my $prefix="32";
- YaST::YCP::Import ("Netmask");
- my @ip_row = split(/\//, $ip);
- $prefix = $ip_row[$#ip_row];
- if (Netmask->Check4($prefix) && $prefix =~ /\./){
- y2milestone("Valid netmask: ", $prefix, " will change to prefixlen");
- $prefix = Netmask->ToBits($prefix);
- }
- $ip = $ip_row[0]."/".$prefix;
my %config=("STARTMODE" => "auto",
"BOOTPROTO" => defined $ifc->{'bootproto'}? $ifc->{'bootproto'}: 'static',
- "IPADDR" => $ip
);
+ if (defined $ifc->{'ipaddr'}) {
+ my $prefix = "32";
+ YaST::YCP::Import ("Netmask");
+ my @ip_row = split(/\//, $ifc->{'ipaddr'});
+ $prefix = $ip_row[$#ip_row];
+ if (Netmask->Check4($prefix) && $prefix =~ /\./){
+ y2milestone("Valid netmask: ", $prefix, " will change to prefixlen");
+ $prefix = Netmask->ToBits($prefix);
+ }
+ $config{"IPADDR"} = $ip_row[0]."/".$prefix;
+ }
if (defined $ifc->{'mtu'}) {
$config{"MTU"} = $ifc->{'mtu'};
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org