Author: mzugec Date: Mon Aug 2 14:04:00 2010 New Revision: 62325 URL: http://svn.opensuse.org/viewcvs/yast?rev=62325&view=rev Log: YaPI: static hostname with DHCP (bnc#624655) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/networ... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Aug 2 14:04:00 2010 @@ -1 +1 @@ -2.17.139 +2.17.140 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/networ... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Aug 2 14:04:00 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 2 14:01:45 CEST 2010 - mzugec@suse.de + +- YaPI: static hostname with DHCP (bnc#624655) +- 2.17.140 + +------------------------------------------------------------------- Mon Jul 26 14:28:35 CEST 2010 - mzugec@suse.de - L3: fixed cmd-line support (bnc#624246) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/networ... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Mon Aug 2 14:04:00 2010 @@ -52,7 +52,8 @@ my %ret = ('interfaces'=>\%interfaces, 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} + 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} +# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} ); return \%ret; } @@ -96,6 +97,7 @@ DNS->Read(); DNS->hostname($args->{'hostname'}->{'name'}); DNS->domain($args->{'hostname'}->{'domain'}); + DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); DNS->modified(1); DNS->Write(); return $ret; Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/networ... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Mon Aug 2 14:04:00 2010 @@ -33,7 +33,7 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"0", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org