September 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r50539 - /tags/stable-2_17_2/x11/
by jdsn＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: jdsn Date: Mon Sep 1 20:21:58 2008 New Revision: 50539 URL: http://svn.opensuse.org/viewcvs/yast?rev=50539&view=rev Log: Created tag stable-2_17_2 for x11 Added: tags/stable-2_17_2/x11/ - copied from r50538, trunk/x11/ -- 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] r50538 - in /trunk/x11: VERSION package/yast2-x11.changes src/autoyast/modules/AutoinstX11.ycp
by jdsn＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: jdsn Date: Mon Sep 1 20:21:51 2008 New Revision: 50538 URL: http://svn.opensuse.org/viewcvs/yast?rev=50538&view=rev Log: fixed type conversion in autoYaST (bnc#418648) Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/autoyast/modules/AutoinstX11.ycp Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=50538&r1=50537&r… ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Mon Sep 1 20:21:51 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Mon Sep 1 20:21:51 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 1 20:20:12 CEST 2008 - jdsn(a)suse.de + +- fixed type conversion in autoYaST setup (bnc#418648) +- 2.17.2 + +------------------------------------------------------------------- Fri Aug 29 23:02:24 CEST 2008 - jdsn(a)suse.de - tablet configuration support during installation (fate#302888) Modified: trunk/x11/src/autoyast/modules/AutoinstX11.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/modules/Autoins… ============================================================================== --- trunk/x11/src/autoyast/modules/AutoinstX11.ycp (original) +++ trunk/x11/src/autoyast/modules/AutoinstX11.ycp Mon Sep 1 20:21:51 2008 @@ -141,7 +141,9 @@ } current_vendor = (string) XLib::getMonitorVendor(); current_model = (string) XLib::getMonitorModel(); - x11["color_depth"] = (string) XLib::getActiveColorDepth(); + // store this value with type integer in the map so it gets exported + // correctly to the autoyast profile (bnc#418648). + x11["color_depth"] = tointeger(XLib::getActiveColorDepth()); x11["resolution"] = (string) XLib::getActiveResolutionString(); display["min_hsync"] = tointeger(XLib::getHsyncMin()); display["max_hsync"] = tointeger(XLib::getHsyncMax()); @@ -184,7 +186,8 @@ XLib::setResolution ( resolution ); // convert value to integer (bnc#307967) - integer colors = tointeger(x11["color_depth"]:16); + // made obsolete by fix for (bnc#418648), cast the value to be sure it is integer + integer colors = (integer) x11["color_depth"]:16; y2milestone("X11-Auto: setup color depth <%1>",colors); XLib::setDefaultColorDepth ( tostring(colors) ); -- 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] r50537 - /trunk/network/yast2-network.spec.in
by kmachalkova＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: kmachalkova Date: Mon Sep 1 18:48:57 2008 New Revision: 50537 URL: http://svn.opensuse.org/viewcvs/yast?rev=50537&view=rev Log: depend on new sysconfig (FaTE #303618) Modified: trunk/network/yast2-network.spec.in Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Mon Sep 1 18:48:57 2008 @@ -12,8 +12,8 @@ # needed for prefixlen support in aliases Requires: yast2 >= 2.17.5 - -Requires: sysconfig +#netconfig (FaTE #303618) +Requires: sysconfig >= 0.71.2 Requires: yast2-packager >= 2.16.37 #GetLanguageCountry #(in newly created yast2-country-data) -- 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] r50536 - in /trunk/network/src: config/networking.rnc modules/DNS.ycp
by kmachalkova＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: kmachalkova Date: Mon Sep 1 18:46:13 2008 New Revision: 50536 URL: http://svn.opensuse.org/viewcvs/yast?rev=50536&view=rev Log: Make NETCONFIG_DNS_POLICY clonable Modified: trunk/network/src/config/networking.rnc trunk/network/src/modules/DNS.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 Sep 1 18:46:13 2008 @@ -210,14 +210,14 @@ dns = element dns { dhcp_hostname ? & - dhcp_resolv ? & + resolv_conf_policy ? & hostname ? & domain ? & nameservers ? & searchlist ? } dhcp_hostname = element dhcp_hostname { BOOLEAN } -dhcp_resolv = element dhcp_resolv { BOOLEAN } +resolv_conf_policy = element resolv_conf_policy { text } hostname = element hostname { text } domain = element domain { text } nameservers = 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 Sep 1 18:46:13 2008 @@ -320,7 +320,9 @@ domain = settings["domain"]:""; nameservers = (list<string>) eval(settings["nameservers"]:[]); searchlist = (list<string>) eval(settings["searchlist"]:[]); - modified = true; + //if not defined, set to 'auto' + resolv_conf_policy = settings["resolv_conf_policy"]:"auto"; + modified = true initialized = true; return true; } @@ -339,6 +341,8 @@ expdns["nameservers"] = eval(nameservers); if (size(searchlist) >0) expdns["searchlist"] = eval(searchlist); + //TODO: test if it really works with empty string + expdns["resolv_conf_policy"] = resolv_conf_policy; return expdns; } -- 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] r50535 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: kmachalkova Date: Mon Sep 1 18:30:52 2008 New Revision: 50535 URL: http://svn.opensuse.org/viewcvs/yast?rev=50535&view=rev Log: Do not write /etc/resolv.conf directly, feed the data to sysconfing and let netconfig do the job (FaTE #303618) Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Sep 1 18:30:52 2008 @@ -315,17 +315,21 @@ y2warning("No routing information in install.inf"); // create resolv.conf only for static configuration - if (size(InstallInf["nameserver"]:"")>0){ - string text = ""; + if (size(InstallInf["nameserver"]:"")>0) + { + //Do not write /etc/resolv.conf directly, feed the data to sysconfig instead, + //'netconfig' will do the job later on network startup (FaTE #303618) + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, InstallInf["nameserver"]:""); + y2milestone("Writing static nameserver entry: %1", InstallInf["nameserver"]:""); //Enter search domain data only if present if( size(InstallInf["domain"]:"") > 0) - text=sformat("search %1\nnameserver %2\n", InstallInf["domain"]:"", InstallInf["nameserver"]:""); - else - //If we don't have search domain data, skip 'search' field, - //do not leave out 'nameserver' completely - #298001 - text = sformat("nameserver %1\n", InstallInf["nameserver"]:""); - y2milestone("Write resolv.conf content: %1", text); - SCR::Write(.target.string, "/etc/resolv.conf", text); + { + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, InstallInf["domain"]:""); + y2milestone("Writing static searchlist entry: %1", InstallInf["domain"]:""); + } + //We're done. It is OK not to touch NETCONFIG_DNS_POLICY now as it is set to 'auto' by default + //and user did not have a chance to modify it up to now + SCR::Write(.sysconfig.network.config, nil); } } -- 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] r50534 - in /trunk/network/src: lan/help.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: kmachalkova Date: Mon Sep 1 17:57:25 2008 New Revision: 50534 URL: http://svn.opensuse.org/viewcvs/yast?rev=50534&view=rev Log: updating help texts to reflect migration to netconfig (FaTE #303618) + removed some old fossil strings Modified: trunk/network/src/lan/help.ycp trunk/network/src/services/dns.ycp Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=505… ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Mon Sep 1 17:57:25 2008 @@ -81,19 +81,17 @@ _("Enable IP Forwarding if the system is a router."), "dhcp_hostname": -_("If you are using DHCP to get an IP address, check whether you get -a hostname via DHCP. You can see the hostname of you host using the hostname command. The hostname -will be set automatically by the DHCP client. -Changing the hostname at runtime may confuse the graphical Desktop. Therefore, disable this option if you connect to different -networks that assign different hostnames. - -"), +_("If you are using DHCP to get an IP address, check whether to get +also a hostname via DHCP. The hostname will be set automatically by the DHCP client. +However, changing the hostname at runtime may confuse the graphical desktop. +Therefore, disable this option if you connect to different networks that assign +different hostnames. "), "write_hostname": -_("If you are using DHCP to get an IP address, your hostname will be written -to <tt>/etc/hosts</tt> and be resolvable as a <tt>127.0.0.2</tt> IP address. -This is the default behavior. To disable this option, uncheck this box. -Now your hostname will not be resolvable without an active network. +_("Your hostname will be written to <tt>/etc/hosts</tt> and will be +resolvable as a <tt>127.0.0.2</tt> IP address. This is the default behavior. +To disable such option, uncheck Write Hostname to /etc/hosts box. +In that case your hostname will not be resolvable without an active network. "), @@ -111,27 +109,27 @@ The primary search domain is usually the same as the domain name of your computer (for example, suse.de). There may be additional search domains (such as suse.com). Separate the domains with commas or white space. -") + - // resolver dialog help - _("If you plan to use a dial-up Internet connection and have set up your -connection to use dynamic DNS assignment, these values will be temporarily -disabled during the connection."), +"), "hostname_global": -_("Optionally enter the name server list and domain search list.") -+ _("Note that the hostname is global--it applies to all -interfaces, not just this one."), - -"modify_resolv_popup": - /* Warning popup text 1/2 */ -_("The resolver configuration file (/etc/resolv.conf) -has been temporarily modified by %1. You have two options:") + - - /* Warning popup text 2/2 */ - _("Modify the current version of the file. -Press Accept and continue editing other data. You are able to return to this dialog at a later time, -when the above service has terminated. -"), +_("Enter the short name for this computer (e.g. mymachine) and the DNS domain +(e.g. example.com) that it belongs to. The domain is especially important if this +computer is a mail server. You can view the hostname of you computer using the hostname +command."), + +"dns_config_policy" : +_("Select the way how DNS configuration (name servers, search list, the content of +/etc/resolv.conf file) will be modified. Normally, it is handled by netconfig +script which merges the data statically defined here with those obtained dynamically (e.g. from +DHCP client, NetworkManager etc.). This is the default, Use Default Policy option and +it is sufficient for most of the configurations.") + + +_("By choosing Only Manually option, netconfig will no longer be allowed to modify +/etc/resolv.conf. You can however edit the file manually. By choosing Use Custom Policy +option, you may specify a custom policy string, which consists of comma-separated list of interface +names, including wildcards, with STATIC and STATIC_FALLBACK as predefined special values. For more +information, see netconfig manual page. Note: leaving the field blank is the same as using +Only Manually policy."), "bootproto": /* Address dialog help 1-6/8: dynamic address preferred */ 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 Sep 1 17:57:25 2008 @@ -343,9 +343,7 @@ /* textentry label */ "label": Label::HostName (), "opt": [], - "help": - // help -_("Enter the name for this computer and the DNS domain that it belongs to."), + "help": help["hostname_global"]:"", "valid_chars": Hostname::ValidChars, "validate_type": `function_no_popup, "validate_function": ValidateHostname, @@ -355,7 +353,6 @@ "HOSTNAME_GLOBAL": $[ "widget": `empty, // #91202 - "help": help["hostname_global"]:"", "init": initHostnameGlobal, "store": storeHostnameGlobal ], @@ -364,7 +361,6 @@ /* textentry label */ "label": _("&Domain Name"), "opt": [], - "help": _("The domain is especially important if this computer is a mail server."), // Do nothing (the widget doesnt have notify anyway) // In particular do not disable the host and domain name widgets, // setting of FQDN should be possible even if DHCP overrides it. @@ -404,7 +400,7 @@ [`custom, _("Use Custom Policy")] ], "init" : initModifyResolvPolicy, "handle": handleModifyResolvPolicy, - "help" : "" + "help" : help["dns_config_policy"]:"", ], "PLAIN_POLICY" : $[ "widget": `combobox, -- 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] r50533 - in /trunk/storage: disk/src/ libstorage/src/
by aschnell＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: aschnell Date: Mon Sep 1 17:09:58 2008 New Revision: 50533 URL: http://svn.opensuse.org/viewcvs/yast?rev=50533&view=rev Log: - work on messages Modified: trunk/storage/disk/src/disk.ycp trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dmmultipath.cc trunk/storage/libstorage/src/Dmraid.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/Partition.cc trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/disk/src/disk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.ycp?rev=50… ============================================================================== --- trunk/storage/disk/src/disk.ycp (original) +++ trunk/storage/disk/src/disk.ycp Mon Sep 1 17:09:58 2008 @@ -22,8 +22,10 @@ import "Popup"; import "Wizard"; import "Misc"; + import "Label"; + // popup text string msg = _("Only use this program if you are familiar with partitioning hard disks. Never partition disks that may, in any way, be in use @@ -39,9 +41,12 @@ if (size (WFM::Args()) == 0) { Wizard::CreateDialog(); - Wizard::SetContents ( + Wizard::SetContents( + // dialog heading _("Expert Partitioner"), - `Label (_("Initializing...")), + // text show during initialization + `Label(_("Initializing...")), + // helptext _("Please wait, while volumes are being detected."), false, false @@ -53,7 +58,7 @@ y2milestone( "warn:%1", warn ); if( warn==nil ) warn = 1; - if (warn==0||Popup::YesNoHeadline(_("Warning"),msg)==true) { + if (warn==0||Popup::YesNoHeadline(Label::WarningMsg(),msg)==true) { y2milestone ("--- Calling disk_worker %1 ---", WFM::Args()); any ret = WFM::call("disk_worker", WFM::Args()); y2milestone ("--- Returned: %1 ---", ret); Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Mon Sep 1 17:09:58 2008 @@ -205,8 +205,8 @@ unsigned long dummy = 0; if( !checkPartedValid( ppart, nm, pl, dummy ) ) { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partitioning on disk %1$s is not readable by\n" "the partitioning tool fdasd, which is used to change the\n" "partition table.\n" Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Mon Sep 1 17:09:58 2008 @@ -436,8 +436,8 @@ if (label == "unsupported") { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partition table type on disk %1$s cannot be handled by\n" "this tool.\n" "\n" @@ -831,8 +831,8 @@ y2mil( "nm:" << nm ); if( !dmp_slave && !checkPartedValid( ppart, nm, pl, range_exceed ) ) { - // popup text %1$s is replaced by disk name e.g. /dev/hda string txt = sformat( + // popup text %1$s is replaced by disk name e.g. /dev/hda _("The partitioning on disk %1$s is not readable by\n" "the partitioning tool parted, which is used to change the\n" "partition table.\n" @@ -847,9 +847,9 @@ } if( range_exceed>0 ) { + string txt = sformat( // popup text %1$s is replaced by disk name e.g. /dev/hda // %2$lu and %3$lu are replaced by numbers. - string txt = sformat( _("Your disk %1$s contains %2$lu partitions. The maximum number\n" "of partitions that the kernel driver of the disk can handle is %3$lu.\n" "Partitions numbered above %3$lu cannot be accessed."), @@ -858,6 +858,7 @@ { txt += "\n"; txt += + // popup text _("openSUSE is switching to the new IDE drivers using the libata\n" "modules. These do only support partitions with up to 15\n" "partitions. You have the following options with openSUSE 10.3:\n" Modified: trunk/storage/libstorage/src/Dmmultipath.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/Dmmultipath.cc (original) +++ trunk/storage/libstorage/src/Dmmultipath.cc Mon Sep 1 17:09:58 2008 @@ -176,7 +176,8 @@ // displayed text during action, %1$s is replaced by multipath partition e.g. pdc_dabaheedj1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending multipath partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Dmraid.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmraid.cc… ============================================================================== --- trunk/storage/libstorage/src/Dmraid.cc (original) +++ trunk/storage/libstorage/src/Dmraid.cc Mon Sep 1 17:09:58 2008 @@ -176,7 +176,8 @@ // displayed text during action, %1$s is replaced by raid partition e.g. pdc_dabaheedj1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending raid partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Mon Sep 1 17:09:58 2008 @@ -267,7 +267,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/system/var // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending logical volume %1$s to %2$s"), dev.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Partition.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition… ============================================================================== --- trunk/storage/libstorage/src/Partition.cc (original) +++ trunk/storage/libstorage/src/Partition.cc Mon Sep 1 17:09:58 2008 @@ -509,7 +509,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending partition %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Mon Sep 1 17:09:58 2008 @@ -2641,7 +2641,8 @@ // displayed text during action, %1$s is replaced by device name e.g. /dev/hda1 // %2$s is replaced by size (e.g. 623.5 MB) txt = sformat( _("Extending %1$s to %2$s"), d.c_str(), sizeString().c_str() ); - txt += _(" (progress bar might not move)"); + // text displayed during action + txt += ' ' + _("(progress bar might not move)"); } else { -- 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] r50532 - in /trunk/storage/storage/src: include/ modules/
by aschnell＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: aschnell Date: Mon Sep 1 16:52:20 2008 New Revision: 50532 URL: http://svn.opensuse.org/viewcvs/yast?rev=50532&view=rev Log: - work on messages Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-raid.ycp trunk/storage/storage/src/include/ep-unused.ycp trunk/storage/storage/src/modules/DevicesSelectionBox.ycp trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Mon Sep 1 16:52:20 2008 @@ -90,6 +90,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Hard Disks"), hd_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), @@ -211,9 +212,12 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch(), + // push button text `PushButton(`id(`smart), _("Smart...")), + // push button text `PushButton(`id(`hdparm), _("HD Parm...")) ) ) @@ -286,11 +290,16 @@ `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add...")), + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch(), + // menu button text `MenuButton(_("Expert..."), expert_cmds) ) )); @@ -389,10 +398,14 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("Hard Disk: %1"), device), hd_icon), `DumbTab(`id(`tab), [ + // tab heading `item(`id(`overview), _("&Overview")), + // tab heading `item(`id(`partitions), _("&Partitions")), + // tab heading `item(`id(`devices), _("&Used Devices")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) @@ -428,8 +441,11 @@ `IconAndHeading(sformat(_("Partition: %1"), device), hd_part_icon), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Mon Sep 1 16:52:20 2008 @@ -31,10 +31,12 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Volume Management"), lvm_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add Volume Group...")), `HStretch() ) @@ -75,7 +77,9 @@ `HStretch(), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -130,9 +134,13 @@ `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `PushButton(`id(`add), _("Add...")), + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -216,10 +224,14 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("Volume Group: %1"), device), lvm_icon), `DumbTab(`id(`tab), [ + // push button text `item(`id(`overview), _("&Overview")), + // push button text `item(`id(`lvs), _("&Logical Volumes")), + // push button text `item(`id(`pvs), _("&Physical Volumes")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) @@ -251,11 +263,15 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(sformat(_("Logical Volume: %1"), device), lvm_lv_icon), StorageFields::Overview(fields, target_map, device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Mon Sep 1 16:52:20 2008 @@ -31,10 +31,12 @@ Greasemonkey::Transform( `VBox( `HStretch(), + // heading `IconAndHeading(_("RAID"), raid_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents), `HBox( + // push button text `Left(`PushButton(`id(`add), _("Add RAID..."))), `HStretch() ) @@ -77,8 +79,11 @@ `HStretch(), StorageFields::Overview(fields, target_map, part_device), `HBox( + // push button text `PushButton(`id(`edit), _("Edit...")), + // push button text `PushButton(`id(`resize), _("Resize...")), + // push button text `PushButton(`id(`delete), _("Delete...")), `HStretch() ) @@ -156,9 +161,12 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(sformat(_("RAID: %1"), device), raid_icon), `DumbTab(`id(`tab), [ + // push button text `item(`id(`overview), _("&Overview")), + // push button text `item(`id(`devices), _("&Used Devices")) ], `ReplacePoint(`id(`tab_panel), TabPanel::empty_panel) Modified: trunk/storage/storage/src/include/ep-unused.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-u… ============================================================================== --- trunk/storage/storage/src/include/ep-unused.ycp (original) +++ trunk/storage/storage/src/include/ep-unused.ycp Mon Sep 1 16:52:20 2008 @@ -47,6 +47,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // heading `IconAndHeading(_("Unused Devices"), unused_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents) Modified: trunk/storage/storage/src/modules/DevicesSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Devi… ============================================================================== --- trunk/storage/storage/src/modules/DevicesSelectionBox.ycp (original) +++ trunk/storage/storage/src/modules/DevicesSelectionBox.ycp Mon Sep 1 16:52:20 2008 @@ -56,6 +56,7 @@ term UnselectedSizeTerm(list<map> unselected_devices) { integer size_k = Sum(unselected_devices); + // footer text, %1 is replaced by size return `Left(`Label(sformat(_("Total size: %1"), Storage::KByteToHumanString(size_k)))); } @@ -63,6 +64,7 @@ term SelectedSizeTerm(list<map> selected_devices) { integer size_k = selected_size_function(selected_devices); + // footer text, %1 is replaced by size return `Left(`Label(sformat(_("Resulting size: %1"), Storage::KByteToHumanString(size_k)))); } Modified: trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Dual… ============================================================================== --- trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp (original) +++ trunk/storage/storage/src/modules/DualMultiSelectionBox.ycp Mon Sep 1 16:52:20 2008 @@ -49,10 +49,14 @@ )), `MarginBox(1, 1, `HSquash(`VBox( + // push button text `PushButton(`id(`add), `opt(`hstretch), _("Add") + " " + UI::Glyph(`ArrowRight)), + // push button text `PushButton(`id(`add_all), `opt(`hstretch), _("Add All") + " " + UI::Glyph(`ArrowRight)), `VSpacing(1), + // push button text `PushButton(`id(`remove), `opt(`hstretch), UI::Glyph(`ArrowLeft) + " " + _("Remove")), + // push button text `PushButton(`id(`remove_all), `opt(`hstretch), UI::Glyph(`ArrowLeft) + " " + _("Remove All")) ))), `HWeight(1, `VBox( Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Mon Sep 1 16:52:20 2008 @@ -777,6 +777,7 @@ } else { + // popup text text = text + _(" Safely ignore this message if you do not intend to use Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Sep 1 16:52:20 2008 @@ -300,6 +300,7 @@ if (locker_name == nil) { if (!Popup::AnyQuestion(Label::ErrorMsg(), + // error popup _("The storage subsystem is locked by an unknown application. You must quit that application before you can continue."), Label::ContinueButton(), Label::CancelButton(), `focus_no)) @@ -308,6 +309,7 @@ else { if (!Popup::AnyQuestion(Label::ErrorMsg(), + // error popup sformat(_("The storage subsystem is locked by the application \"%1\" (%2). You must quit that application before you can continue."), locker_name, locker_pid), Label::ContinueButton(), Label::CancelButton(), Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Mon Sep 1 16:52:20 2008 @@ -42,6 +42,17 @@ }; + string BooleanToHumanString(boolean value) + { + if (value) + // human text for Boolean value + return _("Yes"); + else + // human text for Boolean value + return _("No"); + } + + string UsedByString(symbol ub_type, string used_by) { switch(ub_type) @@ -428,6 +439,7 @@ if (style == `table) return value; else + // row label, %1 is replace by device name return sformat(_("Device: %1"), value); } @@ -437,6 +449,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Size: %1"), value); } @@ -487,6 +500,7 @@ if (style == `table) return value; else + // row label return sformat(_("Type: %1"), value); } @@ -505,15 +519,17 @@ if (style == `table) return value; else + // row label return sformat(_("Format: %1"), value); } case `encrypted: { - string value = data["enc_type"]:`none != `none ? _("Yes") : _("No"); + string value = BooleanToHumanString(data["enc_type"]:`none != `none); if (style == `table) return value; else + // row label, %1 is replace by "Yes" or "No" return sformat(_("Encrypted: %1"), value); } @@ -523,6 +539,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system name e.g. "Ext3" return sformat(_("File System: %1"), value); } @@ -534,6 +551,7 @@ if (style == `table) return value; else + // row label, %1 is replace by mount point e.g. "/mnt" return sformat(_("Mount Point: %1"), value); } @@ -548,6 +566,7 @@ if (style == `table) return value; else + // row label, %1 is replace by mount by method return sformat(_("Mount By: %1"), value); } @@ -557,6 +576,7 @@ if (style == `table) return value; else + // row label, %1 is replace by used by device name e.g. /dev/system return sformat(_("Used By: %1"), value); } @@ -566,6 +586,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system uuid return sformat(_("UUID: %1"), value); } @@ -575,6 +596,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system label return sformat(_("Label: %1"), value); } @@ -584,6 +606,7 @@ if (style == `table) return value; else + // row label, %1 is replace by udev device path return sformat(_("Device Path: %1"), value); } @@ -594,6 +617,7 @@ } else { integer n = size(data["udev_id"]:[]); return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { + // row label, %1 is replaced by number, %2 is replace by udef device id return sformat(_("Device ID %1: %2"), i+1, data["udev_id", i]:""); }), HTML::Newline()); } @@ -605,6 +629,7 @@ if (style == `table) return value; else + // row label, %1 is replace by bios id return sformat(_("BIOS ID: %1"), value); } @@ -614,6 +639,7 @@ if (style == `table) return value; else + // row label, %1 is replace by disk label e.g. "MSDOS" or "GPT" return sformat(_("Disk Label: %1"), value); } @@ -623,6 +649,7 @@ if (style == `table) return value; else + // row label, %1 is replace by vendor name return sformat(_("Vendor: %1"), value); } @@ -632,6 +659,7 @@ if (style == `table) return value; else + // row label, %1 is replace by model string return sformat(_("Model: %1"), value); } @@ -641,6 +669,7 @@ if (style == `table) return value; else + // row label, %1 is replace by bus name e.g. "SCSI" return sformat(_("Bus: %1"), value); } @@ -652,6 +681,7 @@ if (style == `table) return value; else + // row label, %1 is replace by metadata version string return sformat(_("Metadata: %1"), value); } @@ -663,6 +693,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("PE Size: %1"), value); } @@ -681,6 +712,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Stripes: %1"), value); } @@ -690,6 +722,7 @@ if (style == `table) return value; else + // row label, %1 is replace by raid type e.g. "RAID1" return sformat(_("RAID Type: %1"), value); } @@ -703,6 +736,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Chunk Size: %1"), value); } @@ -716,6 +750,7 @@ if (style == `table) return value; else + // row label, %1 is replace by algorithm name return sformat(_("Parity Algorithm: %1"), value); } @@ -727,6 +762,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Number of Cylinders: %1"), value); } @@ -738,6 +774,7 @@ if (style == `table) return value; else + // row label, %1 is replace by size return sformat(_("Cylinder Size: %1"), value); } @@ -753,6 +790,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("Start Cylinder: %1"), value); } @@ -768,6 +806,7 @@ if (style == `table) return value; else + // row label, %1 is replace by integer return sformat(_("End Cylinder: %1"), value); } @@ -778,6 +817,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file system id return sformat(_("FS Id: %1"), value); } break; @@ -788,6 +828,7 @@ if (style == `table) return value; else + // row label, %1 is replace by file path e.g. "/data/secret" return sformat(_("File Path: %1"), value); } @@ -799,6 +840,7 @@ if (style == `table) return value; else + // row label, %1 is replace by wwpn return sformat(_("WWPN: %1"), value); } @@ -810,6 +852,7 @@ if (style == `table) return value; else + // row label, %1 is replace by lun return sformat(_("LUN: %1"), value); } @@ -821,6 +864,7 @@ if (style == `table) return value; else + // row label, %1 is replace by port id return sformat(_("Port ID: %1"), value); } @@ -1080,16 +1124,22 @@ { switch (field) { case `heading_device: + // heading return _("Device:"); case `heading_filesystem: + // heading return _("File System:"); case `heading_hd: + // heading return _("Hard Disk:"); case `heading_fc: + // heading return _("Fibre Channel:"); case `heading_lvm: + // heading return _("LVM:"); case `heading_md: + // heading return _("RAID:"); default: y2error("unknown field %1", field); -- 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] r50531 - /trunk/autoinstallation/src/modules/AutoinstRAID.ycp
by ug＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: ug Date: Mon Sep 1 16:43:23 2008 New Revision: 50531 URL: http://svn.opensuse.org/viewcvs/yast?rev=50531&view=rev Log: cleanup Modified: trunk/autoinstallation/src/modules/AutoinstRAID.ycp Modified: trunk/autoinstallation/src/modules/AutoinstRAID.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstRAID.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstRAID.ycp Mon Sep 1 16:43:23 2008 @@ -78,6 +78,9 @@ * Return deleted MDs * @return list list of deleted MDs */ + + /* useless */ + /* global define list DeletedMDs ( string md ) { list<list<map> > ret = []; foreach( string dev, map devmap, Storage::GetTargetMap(), @@ -97,12 +100,16 @@ return( flatten(ret) ); } + */ /** * Delete MDs * @return list list of deleted MDs */ + + /* useless */ + /* global define list DeleteMDs () { list to_bo_deleted = []; foreach( string dev, map devmap, Storage::GetTargetMap(), ``{ @@ -133,7 +140,7 @@ Storage::SetTargetMap(targetMap); } } - +*/ define boolean remove_possible_mds () { -- 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] r50530 - in /trunk/network/src: clients/lan_auto.ycp modules/DNS.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 01 Sep '08

01 Sep '08

Author: kmachalkova Date: Mon Sep 1 16:40:41 2008 New Revision: 50530 URL: http://svn.opensuse.org/viewcvs/yast?rev=50530&view=rev Log: Reading/writing of /etc/resolv.conf adapted to using netconfig (FaTE #303618) Modified: trunk/network/src/clients/lan_auto.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/services/dns.ycp Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp… ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Mon Sep 1 16:40:41 2008 @@ -161,9 +161,7 @@ if (haskey(dns, "dhcp_hostname")) dhcp["DHCLIENT_SET_HOSTNAME"] = dns["dhcp_hostname"]:false; - if (haskey(dns, "dhcp_resolv")) - dhcp["DHCLIENT_MODIFY_RESOLV_CONF"] = dns["dhcp_resolv"]:false; - + dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_client_id"); dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_additional_options"); dhcp = UpcaseCondSet (dhcp, dhcpopts, "dhclient_hostname_option"); @@ -231,11 +229,9 @@ map config = settings["config"]:$[]; map dhcp = config["dhcp"]:$[]; - boolean dhcp_resolv = dhcp["DHCLIENT_MODIFY_RESOLV_CONF"]:false; boolean dhcp_hostname = dhcp["DHCLIENT_SET_HOSTNAME"]:false; map dns = settings["dns"]:$[]; dns["dhcp_hostname"] = dhcp_hostname; - dns["dhcp_resolv"] = dhcp_resolv; map dhcpopts = $[]; if (haskey(dhcp, "DHCLIENT_HOSTNAME_OPTION")) dhcpopts["dhclient_hostname_option"] = dhcp["DHCLIENT_HOSTNAME_OPTION"]:"AUTO"; 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 Sep 1 16:40:41 2008 @@ -50,6 +50,8 @@ global string resolv_conf_process = ""; global boolean resolv_conf_force = false; +global string resolv_conf_policy = ""; + // fully qualified string oldhostname = ""; @@ -137,38 +139,15 @@ // bogus?! y2milestone ("install.inf: %1", install_inf); - /* check for externally modified resolv.conf */ - if(SCR::Execute(.target.bash, "/sbin/modify_resolvconf check -q < /dev/null") != 0) - resolv_conf_process = (string) SCR::Read(.etc.resolv_conf.process); - else - { - resolv_conf_process = ""; + 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"]:""); } + else + nameservers = resolvlist; - /* only read /etc/resolv.conf if present */ - if(SCR::Read(.target.size, resolv_conf) > 0) { - - /* name servers */ - list<string> resolvlist = (list<string>) SCR::Read(.etc.resolv_conf.nameserver); - if(resolvlist == nil) { - ReadNameserver (install_inf["Nameserver"]:""); - } - else - nameservers = resolvlist; - - /* search list */ - resolvlist = (list<string>) SCR::Read(.etc.resolv_conf.search); - if(resolvlist != nil) searchlist = resolvlist; - if(size(searchlist) < 1) { - string dom = (string) SCR::Read(.etc.resolv_conf.domain); - if(dom != nil && dom != "") searchlist = [ dom ]; - } - } - else { - /* FIXME: propose DNS from Detection */ - nameservers = []; - searchlist = []; - } + 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 @@ -303,32 +282,23 @@ /* update X authorization */ SCR::Write(.xauth.key, xauth_key); + /* if(SCR::Read(.target.size, resolv_conf) < 0) SCR::Write(.target.string, resolv_conf, ""); - + */ + if( update_resolv ) { /* Progress step 3/3 */ ProgressNextStage(_("Updating /etc/resolv.conf ...")); - /* update /etc/resolv.conf */ - SCR::Write(.etc.resolv_conf.search, searchlist); - SCR::Write(.etc.resolv_conf.nameserver, nameservers); - /* update domain in /etc/resolv.conf */ - if(size(searchlist) > 0) - SCR::Write(.etc.resolv_conf.domain, ""); - else - SCR::Write(.etc.resolv_conf.domain, domain); - - /* write only an original header */ - if(resolv_conf_force == true && - (NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false == true)) { - SCR::Write(.etc.resolv_conf.write_header, true); - } + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_POLICY, resolv_conf_policy); + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST, mergestring(searchlist, " ")); + SCR::Write(.sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS, mergestring(nameservers, " ")); + SCR::Write(.sysconfig.network.config, nil); - /* flush the cache */ - SCR::Write(.etc.resolv_conf, nil); - SCR::Execute(.target.bash, "/bin/chmod a+r /etc/resolv.conf"); + SCR::Execute(.target.bash, "/sbin/netconfig update"); + sleep(sl); } else y2milestone("resolv.conf changed by %1, leave untouched", resolv_conf_process); @@ -392,13 +362,14 @@ if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) summary = Summary::AddListItem(summary, _("Hostname will not be written to /etc/hosts")); - if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false) { + + /*if (has_dhcp && NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false) {*/ /* Summary text */ - summary = Summary::AddListItem(summary, _("Name Servers: Set by DHCP")); + /*summary = Summary::AddListItem(summary, _("Name Servers: Set by DHCP")); */ /* Summary text */ - summary = Summary::AddListItem(summary, _("Search List: Set by DHCP")); - } - else { + /*summary = Summary::AddListItem(summary, _("Search List: Set by DHCP")); */ + /*}*/ + /*else {*/ list<string> nslist = maplist(string ns, nameservers, { string nss = NetHwDetection::ResolveIP(ns); return (nss == "") ? ns : (ns + " (" + nss + ")"); @@ -410,7 +381,7 @@ if(size(searchlist) > 0) /* Summary text */ summary = Summary::AddListItem(summary, sformat(_("Search List: %1"), mergestring(searchlist, ", "))); - } + /*}*/ if(size(summary) < 1) return ""; return "<ul>" + summary + "</ul>"; 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 Sep 1 16:40:41 2008 @@ -70,8 +70,7 @@ "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": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true, - "DHCP_RESOLV": NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"]:false, + "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -79,7 +78,7 @@ /* domain search */ string searchstring = mergestring (DNS::searchlist, "\n"); // #49094: populate the search list - if (searchstring == "" && !settings["DHCP_RESOLV"]:false) + if (searchstring == "") { searchstring = settings["DOMAIN"]:""; } @@ -109,8 +108,7 @@ DNS::searchlist = NonEmpty (searchlist); NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true; - NetworkConfig::DHCP["DHCLIENT_MODIFY_RESOLV_CONF"] = settings["DHCP_RESOLV"]:false; - if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Value)) DNS::resolv_conf_process=""; + /* update modified flag */ DNS::modified = true; y2milestone("modified DNS"); @@ -154,19 +152,6 @@ } /** - * Event handler for DHCP_RESOLV checkbox. - * enable or disable: is DHCP available and not used now? HUH?! - * @param key the widget receiving the event - * @param event the event being handled - * @return nil so that the dialog loops on - */ -define symbol HandleDhcpResolv (string key, map event) { - UI::ChangeWidget (`id ("DHCP_RESOLV"), `Enabled, has_dhcp && resolver_modifiable); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("No interface with dhcp"))); - return nil; -} - -/** * Event handler for resolver data (nameservers, searchlist) * enable or disable: is DHCP available? * @param key the widget receiving the event @@ -174,9 +159,7 @@ * @return nil so that the dialog loops on */ define symbol HandleResolverData (string key, map event) { - boolean dhcp_resolv = (boolean) UI::QueryWidget (`id ("DHCP_RESOLV"), `Value); - dhcp_resolv = dhcp_resolv && has_dhcp; // #146162 - UI::ChangeWidget (`id (key), `Enabled, resolver_modifiable && (!dhcp_resolv)); + UI::ChangeWidget (`id (key), `Enabled, resolver_modifiable); return nil; } @@ -258,28 +241,77 @@ } -void initModifyResolv (string key){ - string process = DNS::resolv_conf_process; - if(process == nil || process == "") { - resolver_modifiable = true; - UI::ChangeWidget(`id("MODIFY_RESOLV"), `Enabled, false); - } else { - resolver_modifiable = false; - } - DNS::resolv_conf_force = resolver_modifiable; +void initPolicy(string key) { + + y2milestone("initPolicy: %1", UI::QueryWidget(`id("MODIFY_RESOLV"), `Value)); + + if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `custom) + { + UI::ChangeWidget(`id("PLAIN_POLICY"), `Enabled, true); + if (UI::QueryWidget(`id("PLAIN_POLICY"), `Value) == "") + { + UI::ChangeWidget(`id("PLAIN_POLICY"), `Value, DNS::resolv_conf_policy); + } + } + else + { + UI::ChangeWidget(`id("PLAIN_POLICY"), `Value, ""); + UI::ChangeWidget(`id("PLAIN_POLICY"), `Enabled, false); + } } -symbol handleModifyResolv (string key, map event){ - if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Enabled)) - { - if ((boolean)UI::QueryWidget(`id("MODIFY_RESOLV"), `Value)) - { - resolver_modifiable = true; - } else { - resolver_modifiable = false; +symbol handlePolicy(string key, map event) { + + y2milestone("handlePolicy"); + + if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `custom) + { + DNS::resolv_conf_policy = (string)UI::QueryWidget(`id("PLAIN_POLICY"), `Value); + } + else if(UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `auto) + { + DNS::resolv_conf_policy = "auto"; + } + else + { + DNS::resolv_conf_policy = ""; + } +} + +void initModifyResolvPolicy (string key){ + + y2milestone("initModifyResolvPolicy"); + + if(DNS::resolv_conf_policy == nil || DNS::resolv_conf_policy == "") + { + UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`nomodify) ); + } + else if(DNS::resolv_conf_policy == "auto" || DNS::resolv_conf_policy == "STATIC *") + { + UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`auto) ); } - } - return nil; + else + { + UI::ChangeWidget(`id("MODIFY_RESOLV"), `Value, `id(`custom) ); + } +} + +symbol handleModifyResolvPolicy (string key, map event){ + y2milestone("handleModifyResolvPolicy called: %1", UI::QueryWidget(`id("MODIFY_RESOLV"), `Value)); + + if (UI::QueryWidget(`id("MODIFY_RESOLV"), `Value) == `nomodify) + { + resolver_modifiable = false; + } + else + { + resolver_modifiable = true; + } + + initPolicy(key); + + y2milestone("Exit: resolver_modifiable = %1", resolver_modifiable); + return nil; } @@ -363,14 +395,28 @@ // help "help": help["write_hostname"]:"", ], - "MODIFY_RESOLV" : $[ - "widget": `checkbox, - "label" : _("&Change /etc/resolv.conf manually"), - "opt" : [`notify], - "init" : initModifyResolv, - "handle": handleModifyResolv, - "help" : "" - ], + "MODIFY_RESOLV" : $[ + "widget": `combobox, + "label": _("&Modify DNS configuration"), + "opt" : [`notify], + "items": [ [`nomodify, _("Only Manually")], + [`auto, _("Use Default Policy")], + [`custom, _("Use Custom Policy")] ], + "init" : initModifyResolvPolicy, + "handle": handleModifyResolvPolicy, + "help" : "" + ], + "PLAIN_POLICY" : $[ + "widget": `combobox, + "label": _("&Custom Policy Rule"), + "opt" : [`editable], + "items" : [ [`static, "STATIC"], + [`static_fallback, "STATIC_FALLBACK" ] + ], + "init": initPolicy, + "handle": handlePolicy, + "help" : "" + ], "NAMESERVER_1": $[ "widget": `textentry, /* textentry label */ @@ -397,16 +443,6 @@ "validate_type": `function, "validate_function": ValidateSearchList, ], - "DHCP_RESOLV": $[ - "widget": `custom, - "custom_widget" : `HBox( - `CheckBox(`id("DHCP_RESOLV"), `opt(`notify), _("&Update DNS data via DHCP")), - `ReplacePoint( `id("dh_resolv_text"), `Empty() ) - ), - // help - "help": "", // at "SEARCHLIST_S" - "handle": HandleDhcpResolv, - ], ]; widget_descr_dns["NAMESERVER_2"] = widget_descr_dns["NAMESERVER_1"]:$[]; @@ -432,7 +468,11 @@ `Left("WRITE_HOSTNAME") )), `VSpacing(0.49), - `Left("MODIFY_RESOLV"), + `Left( `HBox( + "MODIFY_RESOLV", + `HSpacing (1), + "PLAIN_POLICY" + ) ), /* Frame label */ `Frame(_("Name Servers and Domain Search List"), `VBox( `VSquash ( `HBox( @@ -444,9 +484,7 @@ `HSpacing (1), `HWeight (1, "SEARCHLIST_S") )), - `VSpacing(0.49), - /* CheckBox label */ - `Left ("DHCP_RESOLV") + `VSpacing(0.49) ) ), `VStretch() @@ -456,8 +494,8 @@ "resolv" : $[ "header" : _("Hostname/DNS"), "contents" : dns_contents, - "widget_names" : ["HOSTNAME", "HOSTNAME_GLOBAL", "DOMAIN", "DHCP_HOSTNAME", "WRITE_HOSTNAME", "MODIFY_RESOLV", - "NAMESERVER_1", "NAMESERVER_2", "NAMESERVER_3", "SEARCHLIST_S", "DHCP_RESOLV"] + "widget_names" : ["HOSTNAME", "HOSTNAME_GLOBAL", "DOMAIN", "DHCP_HOSTNAME", "WRITE_HOSTNAME", "MODIFY_RESOLV", "PLAIN_POLICY", + "NAMESERVER_1", "NAMESERVER_2", "NAMESERVER_3", "SEARCHLIST_S"] ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0