November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> backgroud_patches_bnc550934 : create an SSL certificate with the best hostname, do not start yastwc without a certificate (bnc#557752), version 0.0.20
by J.Daniel Schmidt 23 Nov '09

23 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit c2db5a722725ee68bf539b29d8369ed71508d088 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Mon Nov 23 18:18:20 2009 +0100 create an SSL certificate with the best hostname, do not start yastwc without a certificate (bnc#557752), version 0.0.20 --- webclient/package/check-create-certificate.pl | 22 ++++++++++++++++------ webclient/package/yast2-webclient.changes | 7 +++++++ webclient/package/yastwc | 8 +++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/webclient/package/check-create-certificate.pl b/webclient/package/check-create-certificate.pl index e63c328..8fb27a2 100755 --- a/webclient/package/check-create-certificate.pl +++ b/webclient/package/check-create-certificate.pl @@ -70,9 +70,9 @@ emailAddress = root\@$fqdn chomp $CNF; chomp $CERT; chomp $KEY; - if ( not defined $CNF || $CNF =~ /^$/ || - not defined $CERT || $CERT =~ /^$/ || - not defined $KEY || $KEY =~ /^$/ ) + if ( (not defined $CNF ) || $CNF =~ /^$/ || + (not defined $CERT) || $CERT =~ /^$/ || + (not defined $KEY ) || $KEY =~ /^$/ ) { print STDERR "Could not create temporary files. Aborting.\n"; return 0; @@ -178,10 +178,20 @@ if (defined $create) $hostname = `hostname --fqdn` unless defined $hostname; chomp $hostname if defined $hostname; - unless (defined $hostname) + if ( (not defined $hostname) || $hostname =~ /^$/) { - print STDERR "Hostname missing or invalid. Aborting.\n"; - exit 1; + # do not abort, just create a certificate (bnc#557752) + #print STDERR "Hostname missing or invalid. Aborting.\n"; + #exit 1; + + print STDERR "No fully qualified domain name can be found. Please fix your DNS setup.\n"; + print STDERR "Using only the hostname for SSL certificate.\n"; + $hostname = `hostname`; + chomp $hostname if defined $hostname; + if ( (not defined $hostname) || $hostname =~ /^$/) + { + $hostname = 'localhost'; + } } if ( create_certificate( $hostname, $certfile, $keyfile, $combinedfile ) ) diff --git a/webclient/package/yast2-webclient.changes b/webclient/package/yast2-webclient.changes index c5f0686..5dbf1cb 100644 --- a/webclient/package/yast2-webclient.changes +++ b/webclient/package/yast2-webclient.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 23 18:15:24 CET 2009 - jdsn(a)suse.de + +- create an SSL certificate with the best hostname (bnc#557752) +- do not start yastwc without a certificate (bnc#557752) +- 0.0.20 + +------------------------------------------------------------------- Mon Nov 23 12:19:02 CET 2009 - jdsn(a)suse.de - log check-create-certificate output to logfile diff --git a/webclient/package/yastwc b/webclient/package/yastwc index 99acd07..f25a61a 100755 --- a/webclient/package/yastwc +++ b/webclient/package/yastwc @@ -179,7 +179,13 @@ case "$1" in if [ ! -e $COMBINEDCERTFILE ] then echo "No certificate found. Creating one now." - /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + if ! /usr/sbin/check-create-certificate.pl -c -C $CERTIFICATEFILE -K $CERTKEYFILE -B $COMBINEDCERTFILE >/srv/www/yast/log/check-create-certificate.log 2>&1 + then + echo -n "Can not create certificate. Please see /srv/www/yast/log/check-create-certificate.log for details." + rc_failed + rc_status -v + rc_exit + fi chown lighttpd:lighttpd $CERTIFICATEFILE $CERTKEYFILE $COMBINEDCERTFILE fi -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59723 - in /trunk/network/src: config/networking.rnc installation/inst_hostname.ycp modules/DNS.ycp modules/Host.ycp modules/Lan.ycp services/dns.ycp services/proxy.ycp
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 17:28:52 2009 New Revision: 59723 URL: http://svn.opensuse.org/viewcvs/yast?rev=59723&view=rev Log: Cumulative patch for many SLE11 SP1 bugs and features -(FaTE#305281, bnc#500568, bnc#502715, bnc#438124, bnc#469752, FaTE#302377) Modified: trunk/network/src/config/networking.rnc trunk/network/src/installation/inst_hostname.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Host.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/services/dns.ycp trunk/network/src/services/proxy.ycp Modified: trunk/network/src/config/networking.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/networking.rn… ============================================================================== --- trunk/network/src/config/networking.rnc (original) +++ trunk/network/src/config/networking.rnc Mon Nov 23 17:28:52 2009 @@ -243,6 +243,7 @@ dns = element dns { dhcp_hostname ? & + write_hostname ? & resolv_conf_policy ? & hostname ? & domain ? & @@ -250,6 +251,7 @@ searchlist ? } dhcp_hostname = element dhcp_hostname { BOOLEAN } +write_hostname = element write_hostname { BOOLEAN } resolv_conf_policy = element resolv_conf_policy { text } hostname = element hostname { text } domain = element domain { text } Modified: trunk/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ho… ============================================================================== --- trunk/network/src/installation/inst_hostname.ycp (original) +++ trunk/network/src/installation/inst_hostname.ycp Mon Nov 23 17:28:52 2009 @@ -27,25 +27,19 @@ //if(GetInstArgs::going_back()) // return `auto; +// only once, do not re-propose if user gets back to this dialog from +// the previous screen - bnc#438124 +if (!DNS::proposal_valid) { + DNS::Read (); // handles NetworkConfig too + DNS::ProposeHostname(); // generate random hostname, if none known so far -// FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts -boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); -y2milestone("write_hostname_to_hosts value from control.xml : %1", whth); + // propose settings + DNS::dhcp_hostname = ! Arch::is_laptop (); -DNS::Read (); // handles NetworkConfig too - -if (DNS::hostname == "linux") -{ - srandom (); - DNS::hostname = "linux-" + String::Random (4); // #157107 + // get default value, from control.xml + DNS::write_hostname = DNS::DefaultWriteHostname(); } -// propose settings -NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop (); -// override with setting from control.xml -Host::SetWriteHostname( whth ); -// TODO: policy for proposing a hostname - symbol ret = `next; //No need for interactive UI in automatic configuration Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon Nov 23 17:28:52 2009 @@ -16,11 +16,10 @@ textdomain "network"; import "NetHwDetection"; -import "Host"; import "Hostname"; import "IP"; -import "NetworkConfig"; import "NetworkInterfaces"; +import "ProductFeatures"; import "Progress"; import "Service"; import "String"; @@ -46,11 +45,15 @@ global list<string> nameservers = []; global list<string> searchlist = []; +global boolean dhcp_hostname = false; +global boolean write_hostname = false; global string resolv_conf_policy = ""; // fully qualified string oldhostname = ""; +/* install.inf from linuxrc */ +map install_inf = $[]; /** * Data was modified? */ @@ -106,6 +109,56 @@ return ret; } +global boolean DefaultWriteHostname() { + // FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts + boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); + y2milestone("write_hostname_to_hosts default value: %1", whth); + return whth; +} + +global void ReadHostname() { + + // prefer /etc/install.inf + // (because HOSTNAME comes with netcfg.rpm already, #144687) + string fqhostname = install_inf["Hostname"]:""; // Machinename never existed?? + // if the name is actually an IP only, we discard it too + if (IP::Check (fqhostname)) + { + fqhostname = ""; + } + + // /etc/HOSTNAME + // the usual location + if (fqhostname == "") + { + if (SCR::Read (.target.size, "/etc/HOSTNAME") > 0) + { + fqhostname = (string) SCR::Read (.target.string, "/etc/HOSTNAME"); + //avoid passing nil argument when we get non-\n-terminated string (#445531) + fqhostname = String::FirstChunk( fqhostname, "\n" ); + } + } + + list<string> split = Hostname::SplitFQ (fqhostname); + hostname = split[0]:""; + domain = split[1]:""; + + // last resort + if (hostname == "") + { + hostname = "linux"; + domain = "site"; + } +} + +global void ProposeHostname() { + if (hostname == "linux") + { + srandom (); + hostname = "linux-" + String::Random (4); // #157107 + } +} + /** * resolver config file location */ @@ -125,21 +178,17 @@ if(initialized == true) return true; - //in this order, because Host:;write hostname gets initialized from NetworkConfig::DHCP - NetworkConfig::Read(); - Host::Read(); + string tmp1 = (string) SCR::Read(.sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME); + dhcp_hostname = ( tmp1 == "yes"); + string tmp2 = (string) SCR::Read(.sysconfig.network.dhcp.WRITE_HOSTNAME_TO_HOSTS); + write_hostname = ( tmp2 == "yes"); - Host::SetWriteHostname( NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ); - y2milestone("write_hostname_to_hosts value from sysconfig : %1", NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true); - - /* install.inf from linuxrc */ - map install_inf = $[]; if(SCR::Read(.target.size, "/etc/install.inf") > 0) install_inf = (map) SCR::Read(.etc.install_inf); // bogus?! y2milestone ("install.inf: %1", install_inf); - resolv_conf_policy = (string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_POLICY); + resolv_conf_policy = (string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_POLICY); list<string> resolvlist = splitstring((string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS), " "); if(resolvlist == nil) { ReadNameserver (install_inf["Nameserver"]:""); @@ -150,44 +199,7 @@ searchlist = splitstring((string)SCR::Read(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST), " "); /* hostname and domain */ - // all this is much too intelligent and belongs rather to the proposal - - // prefer /etc/install.inf - // (because HOSTNAME comes with netcfg.rpm already, #144687) - string fqhostname = install_inf["Hostname"]:""; // Machinename never existed?? - // if the name is actually an IP only, we discard it too - if (IP::Check (fqhostname)) - { - fqhostname = ""; - } - - // /etc/HOSTNAME - // the usual location - if (fqhostname == "") - { - if (SCR::Read (.target.size, "/etc/HOSTNAME") > 0) - { - fqhostname = (string) SCR::Read (.target.string, "/etc/HOSTNAME"); - //avoid passing nil argument when we get non-\n-terminated string (#445531) - fqhostname = String::FirstChunk( fqhostname, "\n" ); - } - } - list<string> split = Hostname::SplitFQ (fqhostname); - hostname = split[0]:""; - domain = split[1]:""; - - // detection - if (hostname == "") - { - hostname = NetHwDetection::result["HOSTNAME"]:""; - domain = NetHwDetection::result["DOMAIN"]:""; - } - // last resort - if (hostname == "") - { - hostname = "linux"; - domain = "site"; - } + ReadHostname(); oldhostname = Hostname::MergeFQ (hostname, domain); y2milestone("nameservers=%1", nameservers); @@ -212,17 +224,11 @@ //are defined for each static IP separately in address dialog //FaTE #2202 - if (Host::WriteHostname()) { - //Always add 127.0.0.2 entry to /etc/hosts, otherwise some - //desktop apps may hang, not being able to resolve hostname (#304632) - //empty list [] as third parameter does that - Host::Update(oldhostname, fqhostname, []); - Host::Write(); - } oldhostname = fqhostname; // #49634 - NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname(); - NetworkConfig::Write(); + SCR::Write(.sysconfig.network.dhcp.DHCLIENT_SET_HOSTNAME, dhcp_hostname ? "yes" : "no"); + SCR::Write(.sysconfig.network.dhcp.WRITE_HOSTNAME_TO_HOSTS, write_hostname ? "yes" : "no"); + SCR::Write(.sysconfig.network.dhcp, nil); y2milestone("Writing configuration"); if(!modified) { @@ -234,6 +240,7 @@ y2milestone("searchlist=%1", searchlist); y2milestone("hostname=%1", hostname); y2milestone("domain=%1", domain); + y2milestone("dhcp_hostname=%1, write_hostname=%2", dhcp_hostname, write_hostname); list <string> steps = [ @@ -302,14 +309,40 @@ * @return true if success */ global define boolean Import(map settings) { - hostname = settings["hostname"]:""; - domain = settings["domain"]:""; - nameservers = (list<string>) eval(settings["nameservers"]:[]); - searchlist = (list<string>) eval(settings["searchlist"]:[]); + dhcp_hostname = settings["dhcp_hostname"]:false; //if not defined, set to 'auto' resolv_conf_policy = settings["resolv_conf_policy"]:"auto"; + // user-defined value has higher priority - FaTE#305281 + if ( haskey(settings, "write_hostname") ) + write_hostname = settings["write_hostname"]:false; + // otherwise, use control.xml default + else + write_hostname = DefaultWriteHostname(); + + // user-defined <hostname> + if ( haskey(settings, "hostname") && haskey(settings, "domain")) { + hostname = settings["hostname"]:""; + domain = settings["domain"]:"site"; + } + else { + // otherwise, check 1) install.inf 2) /etc/HOSTNAME + ReadHostname(); + // if nothing is found, generate a random one + ProposeHostname(); + } + + nameservers = (list<string>) eval(settings["nameservers"]:[]); + searchlist = (list<string>) eval(settings["searchlist"]:[]); modified = true; initialized = true; + + y2milestone("DNS Import:"); + y2milestone("nameservers=%1", nameservers); + y2milestone("searchlist=%1", searchlist); + y2milestone("hostname=%1", hostname); + y2milestone("domain=%1", domain); + y2milestone("dhcp_hostname=%1, write_hostname=%2", dhcp_hostname, write_hostname); + return true; } @@ -327,6 +360,7 @@ expdns["nameservers"] = eval(nameservers); if (size(searchlist) >0) expdns["searchlist"] = eval(searchlist); + expdns["dhcp_hostname"] = dhcp_hostname; //TODO: test if it really works with empty string expdns["resolv_conf_policy"] = resolv_conf_policy; return expdns; @@ -343,13 +377,13 @@ boolean has_dhcp = size (NetworkInterfaces::Locate ("BOOTPROTO", "dhcp")) > 0; - if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false) + if (has_dhcp && dhcp_hostname) /* Summary text */ summary = Summary::AddListItem(summary, _("Hostname: Set by DHCP")); else if(size(hostname) > 0) /* Summary text */ summary = Summary::AddListItem(summary, sformat(_("Hostname: %1"), Hostname::MergeFQ(hostname, domain))); - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) + if ( !write_hostname ) summary = Summary::AddListItem(summary, _("Hostname will not be written to /etc/hosts")); @@ -390,8 +424,8 @@ NetworkInterfaces::Read (); map <string, string> dhcp_data = $[]; - if ( (size( NetworkInterfaces::Locate("BOOTPROTO", "dhcp") ) > 0) || - NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false == true ) { + if ( (size( NetworkInterfaces::Locate("BOOTPROTO", "dhcp") ) > 0) || + dhcp_hostname ) { dhcp_data = GetDHCPHostnameIP(); y2milestone("Got DHCP-configured data: %1", dhcp_data); } Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev… ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Mon Nov 23 17:28:52 2009 @@ -12,8 +12,9 @@ module "Host"; textdomain "network"; +import "DNS"; import "Hostname"; -import "NetworkConfig"; +import "NetworkInterfaces"; import "String"; import "Summary"; @@ -33,11 +34,6 @@ global boolean modified = false; /** - * Should static hostname be written to /etc/hosts? - */ -boolean write_hostname = true; - -/** * All hosts read at the start */ map<string,any> hosts_init = $[]; @@ -54,14 +50,44 @@ boolean initialized = false; -global boolean WriteHostname() -{ - return write_hostname; +boolean AnyStaticIP() { + NetworkInterfaces::Read (); + list<string> devs = + NetworkInterfaces::Locate ("BOOTPROTO", "static"); + list<string> ips = maplist(string dev, devs, { + return NetworkInterfaces::GetValue(dev, "IPADDR"); + }); + + y2milestone("%1 %2", devs, ips); + return ( size(ips) > 0 ); } -global void SetWriteHostname( boolean w) -{ - write_hostname = w; +boolean NeedDummyIP() { + boolean ret = ( DNS::write_hostname && !AnyStaticIP() ); + if (ret) + y2milestone("No (static) IP address found, dummy 127.0.0.2 will be added"); + return ret; +} + +global void EnsureHostnameResolvable() { + string local_ip = "127.0.0.2"; + if ( NeedDummyIP() ) { + //Add 127.0.0.2 entry to /etc/hosts,if product default says so + //or user requests it otherwise some desktop apps may hang, + //being unable to resolve hostname (bnc#304632) + + string fqhostname = Hostname::MergeFQ( DNS::hostname, DNS::domain); + hosts[ local_ip ] = [ fqhostname + " " + DNS::hostname ]; + modified = true; + } + else { + // do not add it if product default says no or if there are some + // static IPs (bnc#469752) + if( haskey( hosts, local_ip) ) { + hosts[ local_ip] = []; + modified = true; + } + } } /** @@ -70,7 +96,8 @@ */ global define boolean Read() { - if(initialized == true) return true; + if(initialized == true) + return true; /* read /etc/hosts */ if(SCR::Read(.target.size, hosts_file) > 0) { @@ -96,11 +123,11 @@ */ global define boolean Write() { - y2milestone("Writing configuration"); + y2milestone("Writing hosts configuration"); if(!modified) { - y2milestone("No changes to Host -> nothing to write"); - return true; + y2milestone("No changes to Host -> nothing to write"); + return true; } /* Check if there is anything to do */ @@ -220,42 +247,6 @@ string nick = Hostname::SplitFQ(newhn)[0]:""; string oldnick = Hostname::SplitFQ(oldhn)[0]:""; - string oldhostname = ""; - string oldhostip = ""; - - /* Read oldhostname entry */ - list oldhost = []; - string ohentry = nil; - if(SCR::Read(.target.size, "/var/adm/SuSEconfig/oldhostentry") > 0) - ohentry = (string) SCR::Read(.target.string, "/var/adm/SuSEconfig/oldhostentry"); - if(ohentry != nil) - oldhost = splitstring(ohentry, "\n"); - - if(size(oldhost) > 0) - oldhostname = String::CutBlanks(oldhost[0]:""); - if(size(oldhost) > 1) - oldhostip = String::CutBlanks(oldhost[1]:""); - y2milestone("oldhostname: '%1' : '%2'", oldhostname, oldhostip); - - /* Remove old hostname from hosts */ - if(haskey(hosts, oldhostip)) { - y2debug("Deleting: %1", oldhostip); - hosts = remove(hosts, oldhostip); - } - y2debug("Hosts: %1", hosts); - - /* Add at least one hostname/ip */ - // but do not overload localhost (#46715) - if (write_hostname) { - if (size(ips) < 1 && nick != "localhost") { - y2milestone("Adding dummy 127.0.0.2 %1 entry", newhn); - // TODO #42102 - hosts["127.0.0.2"] = [ newhn + " " + nick ]; - y2milestone("Hosts: %1", hosts); - return true; - } - } - /* Remove old hostname from hosts */ // list oldhnlist = []; foreach (string ip, list<string> hs, hosts, { Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Nov 23 17:28:52 2009 @@ -385,6 +385,7 @@ // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup DNS::Write(); + Host::EnsureHostnameResolvable(); Host::Write(); Progress::set (orig); @@ -416,7 +417,7 @@ if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())){ + if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { UI::OpenDialog(`opt(`decorated), `HBox( `HSpacing(1), `HCenter(`HSquash(`VBox( @@ -452,11 +453,14 @@ } // For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) - else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) y2milestone("For ssh or vnc installation don't reload/restart network during installation."); - else if (LanItems::force_restart) Service::Restart("network"); - else if(Service::Status("network")==0){ - Service::Reload("network"); - } else Service::Restart("network"); + else if (Stage::cont() && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) + y2milestone("For ssh or vnc installation don't reload/restart network during installation."); + else if (LanItems::force_restart) + Service::Restart("network"); + else if(Service::Status("network")==0){ + Service::Reload("network"); + } + else Service::Restart("network"); sleep(sl); } Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Mon Nov 23 17:28:52 2009 @@ -64,14 +64,12 @@ * @return initial settings for this dialog in one map, from DNS:: */ define map InitSettings () { -// boolean write_hostname = true; map settings = $[ "HOSTNAME": DNS::hostname, "DOMAIN": DNS::domain, - "DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false, - // set as true by default because there wasn't this option in previous version - "WRITE_HOSTNAME": Host::WriteHostname() + "DHCP_HOSTNAME": DNS::dhcp_hostname, + "WRITE_HOSTNAME": DNS::write_hostname ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -108,8 +106,8 @@ DNS::domain = settings["DOMAIN"]:""; DNS::nameservers = NonEmpty (nameservers); DNS::searchlist = NonEmpty (searchlist); - NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; - Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true ); + DNS::dhcp_hostname = settings["DHCP_HOSTNAME"]:false; + DNS::write_hostname = settings["WRITE_HOSTNAME"]:true; /* update modified flag */ DNS::modified = true; @@ -147,9 +145,10 @@ */ define void InitDhcpHostname (string key) { UI::ChangeWidget (`id("DHCP_HOSTNAME"), `Enabled, has_dhcp); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("No interface with dhcp"))); - // the hostname dialog proposes to update it by DHCP on a laptop (#326102) - else + if (!has_dhcp) + UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("No interface with dhcp"))); + // the hostname dialog proposes to update it by DHCP on a laptop (#326102) + else UI::ChangeWidget(`id("DHCP_HOSTNAME"), `Value, hn_settings["DHCP_HOSTNAME"]:true); return nil; } Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Mon Nov 23 17:28:52 2009 @@ -11,9 +11,11 @@ textdomain "network"; +import "Address"; import "Hostname"; import "Label"; import "Mode"; +import "Netmask"; import "Popup"; import "Proxy"; import "String"; @@ -301,6 +303,39 @@ } +boolean ValidateNoProxyDomains( string no_proxies ) { + list <string> proxy_list = splitstring( no_proxies, ","); + boolean validate = true; + string hostname = ""; + string netmask = ""; + + foreach( string one_proxy, proxy_list, { + one_proxy = String::CutBlanks( one_proxy ); + + // IP/netmask + if ( findfirstof( one_proxy, "/" ) != nil ) { + list <string> tmp = splitstring(hostname,"/"); + hostname = tmp[0]:""; + netmask = tmp[1]:""; + + if (!Netmask::Check( netmask )) + validate = false; + } + // hostname or domain name + else { + hostname = one_proxy; + // .domain.name case + if ( findfirstof( hostname, ".") == 0) + hostname = substring(hostname, 1); + } + y2milestone("hostname %1, netmask %2", hostname, netmask); + + if (!Address::Check(hostname)) + validate = false; + }); + + return validate; +} /** * Proxy dialog * @param standalone true if not run from another ycp client @@ -481,10 +516,6 @@ /* next */ else if (ret == `next || ret == "test_proxy") { - list<string> no_list = splitstring (no, " ,"); - no_list = filter (string no_i, no_list, ``( no_i != "") ); - no = mergestring (no_list, ", "); - if(http == prefill) http = ""; if(https == prefill) https = ""; if(ftp == prefill) ftp = ""; @@ -551,6 +582,19 @@ continue; } } + if ( no != "" && no != nil) { + if (!ValidateNoProxyDomains( no )) { + //Translators: no proxy domain is a domain that can be accessed without proxy + Popup::Error(_("One or more no proxy domains are invalid. +Check if all domains match one of the following: +* IP address +* IP address/netmask +* Fully qualified hostname +* Domain name prefixed by '.'")); + UI::SetFocus(`id(`no)); + continue; + } + } if (ret == `next) { break; @@ -576,6 +620,7 @@ return ret; } + Proxy::enabled = enabled; if(enabled) { Proxy::http = http; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59722 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: lslezak Date: Mon Nov 23 17:27:24 2009 New Revision: 59722 URL: http://svn.opensuse.org/viewcvs/yast?rev=59722&view=rev Log: - repositories - added NFSv4 support (fate#306451), don't loose the current URL when switching between full and parsed view Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Nov 23 17:27:24 2009 @@ -10,6 +10,8 @@ (bnc#549866) - repositories - improved ISO image file detection (use plain text instead of MIME type for 'file' output) (bnc#547683) +- repositories - added NFSv4 support (fate#306451), don't loose + the current URL when switching between full and parsed view ------------------------------------------------------------------- Fri Nov 20 15:57:12 CET 2009 - lslezak(a)suse.cz Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Mon Nov 23 17:27:24 2009 @@ -419,7 +419,9 @@ ) ), // checkbox label - `Left (`CheckBox ( `id (`ch_iso), _("&ISO Image"))) + `Left (`CheckBox ( `id (`ch_iso), _("&ISO Image"))), + // checkbox label + `Left (`CheckBox ( `id (`ch_nfs4), _("N&FS v4 Protocol"))) ); term nfs_complete_content = `InputField(`id(`complete_url), `opt(`hstretch), _("URL of the Repository")); @@ -449,6 +451,13 @@ UI::ChangeWidget (`id (`dir), `Value, parsed["path"]:""); UI::ChangeWidget (`id (`ch_iso), `Value, iso); UI::SetFocus (`server); + + boolean nfs4 = tolower(parsed["scheme"]:"nfs") == "nfs4" || + URL::MakeMapFromParams(parsed["query"]:"")["type"]:"" == "nfs4"; + + y2milestone("NFSv4: %1", nfs4); + + UI::ChangeWidget (`id (`ch_nfs4), `Value, nfs4); } else { @@ -456,6 +465,48 @@ } } +void NFSStoreParts() +{ + map parsed = $[ + "scheme" : "nfs", + "host" : NormalizeHost ( + (string)UI::QueryWidget (`id (`server), `Value)), + "path" : (string)UI::QueryWidget (`id (`dir), `Value), + ]; + + boolean nfs4 = (boolean)UI::QueryWidget (`id (`ch_nfs4), `Value); + if (nfs4) + { + // keep nfs4:// if it is used in the original URL + if (tolower(URL::Parse(_url)["scheme"]:"") == "nfs4") + { + parsed["scheme"] = "nfs4"; + } + else + { + parsed["query"] = "type=nfs4"; + } + } + + _url = URL::Build (parsed); + boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); + + // workaround: URL::Build does not accept numbers in scheme, + // for nfs4 scheme it returns URL with no scheme (like "://foo/bar") + if(!regexpmatch(_url, "^nfs")) + { + _url = "nfs4" + _url; + } + + if (iso) + _url = PosprocessISOURL (_url); +} + +void NFSStoreComplete() +{ + _url = (string)UI::QueryWidget(`id(`complete_url), `Value); +} + /** * Store function of a widget * @param key string widget key @@ -467,20 +518,11 @@ if (current_type == `edit_url_parts) { - map parsed = $[ - "scheme" : "nfs", - "host" : NormalizeHost ( - (string)UI::QueryWidget (`id (`server), `Value)), - "path" : (string)UI::QueryWidget (`id (`dir), `Value), - ]; - _url = URL::Build (parsed); - boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); - if (iso) - _url = PosprocessISOURL (_url); + NFSStoreParts(); } else { - _url = (string)UI::QueryWidget(`id(`complete_url), `Value); + NFSStoreComplete(); } } @@ -518,7 +560,17 @@ } else if ((event["ID"]:nil == `edit_url_parts || event["ID"]:nil == `edit_complete_url) && event["EventReason"]:"" == "ValueChanged") { - y2milestone("Changing dialog type"); + y2milestone("Changing dialog type: %1", event["ID"]:nil); + + // store the current settings + if (event["ID"]:nil == `edit_url_parts) + { + NFSStoreComplete(); + } + else + { + NFSStoreParts(); + } // reinitialize the dialog (set the current values) NFSInit(nil); @@ -1195,7 +1247,8 @@ `ReplacePoint (`id (`server_rp), `Empty ()) ); -term complete_content = `InputField(`id(`complete_url), `opt(`hstretch), _("URL of the Repository")); +// input field label +term complete_content = `InputField(`id(`complete_url), `opt(`hstretch), _("&URL of the Repository")); void ServerStoreParts() { @@ -1876,6 +1929,7 @@ else if ( _url == "https://" ) current = `https; else if ( _url == "smb://" ) current = `samba; else if ( _url == "nfs://" ) current = `nfs; + else if ( _url == "nfs4://" ) current = `nfs; else if ( _url == "cd:///" ) current = `cd; else if ( _url == "dvd:///" ) current = `dvd; else if ( _url == "hd://" ) current = `hd; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59721 - /tags/branch-Code-11-SP1-2_17_62/bootloader/
by juhliarik＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: juhliarik Date: Mon Nov 23 17:01:01 2009 New Revision: 59721 URL: http://svn.opensuse.org/viewcvs/yast?rev=59721&view=rev Log: Created tag branch-Code-11-SP1-2_17_62 for bootloader Added: tags/branch-Code-11-SP1-2_17_62/bootloader/ (props changed) - copied from r59720, branches/SuSE-Code-11-SP1-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59720 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: juhliarik Date: Mon Nov 23 17:00:52 2009 New Revision: 59720 URL: http://svn.opensuse.org/viewcvs/yast?rev=59720&view=rev Log: new version 2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Mon Nov 23 17:00:52 2009 @@ -1 +1 @@ -2.17.61 +2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Nov 23 17:00:52 2009 @@ -3,6 +3,7 @@ - added fix for converting device name to persistent device name for ppc (bnc#510086) +- 2.17.62 ------------------------------------------------------------------- Mon Nov 23 16:38:57 CET 2009 - juhliarik(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59719 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: package/yast2-bootloader.changes src/clients/bootloader_proposal.ycp src/routines/misc.ycp
by juhliarik＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: juhliarik Date: Mon Nov 23 16:51:00 2009 New Revision: 59719 URL: http://svn.opensuse.org/viewcvs/yast?rev=59719&view=rev Log: added fix for persistent device names on PPC Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Nov 23 16:51:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 23 16:50:57 CET 2009 - juhliarik(a)suse.cz + +- added fix for converting device name to persistent device name + for ppc (bnc#510086) + +------------------------------------------------------------------- Mon Nov 23 16:38:57 CET 2009 - juhliarik(a)suse.cz - added support for installing an booting MD RAID from Intel Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp Mon Nov 23 16:51:00 2009 @@ -18,6 +18,7 @@ import "Storage"; import "Mode"; import "BootSupportCheck"; + import "Popup"; include "bootloader/routines/wizards.ycp"; Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Mon Nov 23 16:51:00 2009 @@ -628,16 +628,7 @@ global define string Dev2MountByDev(string dev) { y2milestone ("Dev2MountByDev: %1", dev); - - // (`id,`uuid,`path,`device,`label) symbol by_mount = nil; - if (Arch::ppc()) - by_mount = `id; - else - by_mount = Storage::GetDefaultMountBy(); - - //by_mount = `id; - y2milestone("Default mount by is %1", by_mount); // add all_partitions to partitions if (MapAllPartitions()) @@ -648,6 +639,37 @@ map partition = $[]; map device = $[]; string ret = dev; + + // bnc#510086 mountby-Option "device" from the AutoYast partitioning profile + // isnt correctly populating lilo.conf + // (`id,`uuid,`path,`device,`label) + // bnc#458018 accept different mount-by for partition + // created by user + by_mount = Storage::GetDefaultMountBy(); + //by_mount = `id; + y2milestone("Default mount by is %1", by_mount); + + if (haskey(partitions, dev)) + { + symbol partition_mount_by = (symbol) partitions[dev, "mountby"]:nil; + if ((partition_mount_by != nil)) + by_mount = partition_mount_by; + } + + if (by_mount == `device) + { + y2milestone("Skip converting device: %1 to persistent device names because mountby is set to: %2", + dev, by_mount); + return dev; + } + + if (Arch::ppc()) + { + by_mount = `id; + y2milestone("Adding default mount-by for ppc (`id)"); + } + + switch(by_mount) { // convert to udev_id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59718 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: package/yast2-bootloader.changes src/clients/bootloader_proposal.ycp
by juhliarik＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: juhliarik Date: Mon Nov 23 16:41:40 2009 New Revision: 59718 URL: http://svn.opensuse.org/viewcvs/yast?rev=59718&view=rev Log: added fix for autoyast installation Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Mon Nov 23 16:41:40 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Nov 23 16:38:57 CET 2009 - juhliarik(a)suse.cz + +- added support for installing an booting MD RAID from Intel + (fate#305883) and (fate#307447) +- added fix for updating configuration of bootloader in autoyast + installation (bnc#556052) + +------------------------------------------------------------------- Wed Nov 18 16:18:57 CET 2009 - juhliarik(a)suse.cz - added fix for updating device.map (bnc#477778) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/clients/bootloader_proposal.ycp Mon Nov 23 16:41:40 2009 @@ -214,6 +214,28 @@ } + + //bnc #556052 problem with changes in storage during installation via autoyast + if ((BootCommon::cached_settings_base_data_change_time != Storage::GetTargetChangeTime()) && + (BootCommon::cached_settings_base_data_change_time != nil) && + (Bootloader::getLoaderType () == "grub") && + (Mode::autoinst ())) + { + + if (Popup::TimedOKCancel(_("Changes in disk partitioning were detected since the time the bootloader was configured. +Do you want to propose bootloader configuration again? +If yes, all previous bootloader configuration will be lost. +If not, you probably need to change the configuration manually."), 10)) + { + y2milestone ("Partitionig of disk was changed => reset proposal"); + BootCommon::Reset (true); + Bootloader::Propose(); + } else { + y2warning ("User cancel automatic changes in bootloader during autoyast installation"); + } + } + + // cache the values Bootloader::cached_settings = Bootloader::Export(); BootCommon::cached_settings_base_data_change_time = Storage::GetTargetChangeTime(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59717 - in /trunk/control-center: package/yast2-control-center.changes src/main_window.cpp
by kmachalkova＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: kmachalkova Date: Mon Nov 23 16:34:35 2009 New Revision: 59717 URL: http://svn.opensuse.org/viewcvs/yast?rev=59717&view=rev Log: s/YaST2/YaST/ in translatable string Modified: trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/main_window.cpp Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Mon Nov 23 16:34:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 23 16:30:53 CET 2009 - kmachalkova(a)suse.cz + +- Use 'YaST' instead of 'YaST2' in messages and window titlebars + (bnc#532518) + +------------------------------------------------------------------- Tue Oct 20 11:59:43 CEST 2009 - kmachalkova(a)suse.cz - The same module order for every language (to prevent broken sync Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.c… ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Mon Nov 23 16:34:35 2009 @@ -301,8 +301,8 @@ void MainWindow::initialMsg() { if ( !d->modmodel->isRoot() ) - QMessageBox::information(this, _("YaST2 Control Center"), - _("YaST2 Control Center is not running as root.\n" + QMessageBox::information(this, _("YaST Control Center"), + _("YaST Control Center is not running as root.\n" "You will only see modules which do not require root privileges.")); } @@ -348,7 +348,7 @@ void MainWindow::setWinTitle() { - QString title = _("YaST2 Control Center"); + QString title = _("YaST Control Center"); char hostname[ MAXHOSTNAMELEN+1 ]; if ( gethostname( hostname, sizeof( hostname )-1 ) == 0 ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59716 - /tags/branch-Code-11-SP1-2_17_84/storage/
by aschnell＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: aschnell Date: Mon Nov 23 16:27:44 2009 New Revision: 59716 URL: http://svn.opensuse.org/viewcvs/yast?rev=59716&view=rev Log: Created tag branch-Code-11-SP1-2_17_84 for storage Added: tags/branch-Code-11-SP1-2_17_84/storage/ (props changed) - copied from r59715, branches/SuSE-Code-11-SP1-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59715 - /tags/branch-Code-11-SP1-2_17_84/
by aschnell＠svn.opensuse.org 23 Nov '09

23 Nov '09

Author: aschnell Date: Mon Nov 23 16:27:43 2009 New Revision: 59715 URL: http://svn.opensuse.org/viewcvs/yast?rev=59715&view=rev Log: Created tag branch-Code-11-SP1-2_17_84 Added: tags/branch-Code-11-SP1-2_17_84/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0