Author: mzugec Date: Tue Jul 27 16:21:18 2010 New Revision: 62312 URL: http://svn.opensuse.org/viewcvs/yast?rev=62312&view=rev Log: YaPI: allow dhcp + static hostname (bnc#624655) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/YaPI/NETWORK.pm trunk/network/testsuite/tests/Network_YaPI.out trunk/network/testsuite/tests/Network_YaPI.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62312&r1=6231... ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jul 27 16:21:18 2010 @@ -1 +1 @@ -2.19.34 +2.19.35 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.cha... ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jul 27 16:21:18 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 27 16:20:24 CEST 2010 - mzugec@suse.cz + +- YaPI: allow dhcp + static hostname (bnc#624655) +- 2.19.35 + +------------------------------------------------------------------- Mon Jul 26 17:43:09 CEST 2010 - mzugec@suse.cz - L3: allow unconfigured devices for VLAN (bnc#625103) Modified: trunk/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/YaPI/NETWORK.pm?r... ============================================================================== --- trunk/network/src/lan/YaPI/NETWORK.pm (original) +++ trunk/network/src/lan/YaPI/NETWORK.pm Tue Jul 27 16:21:18 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: trunk/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_Y... ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.out (original) +++ trunk/network/testsuite/tests/Network_YaPI.out Tue Jul 27 16:21:18 2010 @@ -1,6 +1,6 @@ Read .target.tmpdir nil Log Failed to set temporary directory: nil -Read .sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME "no" +Read .sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME "yes" Read .sysconfig.network.dhcp.WRITE_HOSTNAME_TO_HOSTS "no" Read .sysconfig.network.config.NETCONFIG_DNS_POLICY nil Read .sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS "208.67.222.222 208.67.220.220" @@ -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":"1", "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"]] Modified: trunk/network/testsuite/tests/Network_YaPI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Network_Y... ============================================================================== --- trunk/network/testsuite/tests/Network_YaPI.ycp (original) +++ trunk/network/testsuite/tests/Network_YaPI.ycp Tue Jul 27 16:21:18 2010 @@ -20,7 +20,7 @@ "NETCONFIG_DNS_STATIC_SEARCHLIST" : "suse.cz suse.de" ], "dhcp" : $[ - "DHCLIENT_SET_HOSTNAME" : "no", + "DHCLIENT_SET_HOSTNAME" : "yes", "WRITE_HOSTNAME_TO_HOSTS" : "no" ] ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org