February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55745 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by jsrain＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: jsrain Date: Wed Feb 25 14:55:46 2009 New Revision: 55745 URL: http://svn.opensuse.org/viewcvs/yast?rev=55745&view=rev Log: do not store HW address into sysconfig on hsi and some qeth interfaces (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Wed Feb 25 14:55:46 2009 @@ -1 +1 @@ -2.17.72 +2.17.73 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Wed Feb 25 14:55:46 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 25 14:47:29 CET 2009 - jsrain(a)suse.cz + +- do not store HW address into sysconfig on hsi and some qeth + interfaces (bnc #479481) +- 2.17.73 + +------------------------------------------------------------------- Mon Feb 23 11:51:27 CET 2009 - mzugec(a)suse.cz - restart network when NetworkManager selected (bnc#467939) Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Wed Feb 25 14:55:46 2009 @@ -120,6 +120,21 @@ // InstallInf = remove(InstallInf, "netdevice"); } + if (Arch::s390()) { + y2milestone ("Interface type: %1", InstallInf["type"]:""); + // hsi devices do not support setting hwaddr (bnc #479481) + if (InstallInf["type"]:"" == "hsi" && haskey (InstallInf, "hwaddr")) + InstallInf = remove (InstallInf, "hwaddr"); + // do not set MAC address of device if it is the same as of an existing device (bnc #479481) + list<string> known_hwaddr = []; + foreach (map c, (list<map>)SCR::Read (.probe.netcard), { + list hwaddr = maplist (map m, c["resource", "hwaddr"]:[], { return m["addr"]:""; }); + known_hwaddr = (list<string>)merge (known_hwaddr, hwaddr); + }); + if (InstallInf["type"]:"" == "qeth" && haskey (InstallInf, "hwaddr") && contains (known_hwaddr, InstallInf["hwaddr"]:"")) + InstallInf = remove (InstallInf, "hwaddr"); + } + /* Split FQ hostname */ string hostname = InstallInf["hostname"]:""; if(hostname != "" && !IP::Check (hostname)) { -- 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] r55744 - in /trunk/core: base/tools/tty_wrapper/tty_wrapper.cc package/yast2-core.changes
by mvidner＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: mvidner Date: Wed Feb 25 14:50:23 2009 New Revision: 55744 URL: http://svn.opensuse.org/viewcvs/yast?rev=55744&view=rev Log: Fixed tty_wrapper losing output: stdio was interrupted by SIGCHLD (bnc#470645). Modified: trunk/core/base/tools/tty_wrapper/tty_wrapper.cc trunk/core/package/yast2-core.changes Modified: trunk/core/base/tools/tty_wrapper/tty_wrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/base/tools/tty_wrapper/tty_… ============================================================================== --- trunk/core/base/tools/tty_wrapper/tty_wrapper.cc (original) +++ trunk/core/base/tools/tty_wrapper/tty_wrapper.cc Wed Feb 25 14:50:23 2009 @@ -74,6 +74,32 @@ return true; } +void output(const std::string & s, int fd) +{ + const char *cs = s.c_str(); + while (true) { + ssize_t n = s.size(); + ssize_t w = write(fd, cs, n); + if (w == n) + break; // success + else if (w == -1) { + if (errno == EINTR) { + // perror("gotcha"); // bnc#470645 + } + else { + perror("write"); // other cases + break; + } + } + else { + errno = 0; + perror("short"); + cs += w; + n -= w; + } + } +} + int main(int argc, char **argv) { if (argc > 1) @@ -168,7 +194,7 @@ { // read stdout of the subprocess and print it on stdout std::string std_out(subprocess.read()); - std::cout << std_out; + output(std_out, 1); } // stderr available @@ -176,7 +202,7 @@ { // read stderr of the subprocess and print it on stderr std::string err_out(subprocess.readErr()); - std::cerr << err_out; + output(err_out, 2); } } } @@ -189,4 +215,3 @@ return 1; } } - Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Wed Feb 25 14:50:23 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 25 14:49:33 CET 2009 - mvidner(a)suse.cz + +- Fixed tty_wrapper losing output: stdio was interrupted by SIGCHLD (bnc#470645). + +------------------------------------------------------------------- Thu Jan 29 15:15:57 CET 2009 - aschnell(a)suse.de - added dbus client agent (required for bnc #464453) -- 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] r55743 - /trunk/storage/libstorage/src/Graph.cc
by aschnell＠svn.opensuse.org 25 Feb '09

25 Feb '09

Author: aschnell Date: Wed Feb 25 12:55:27 2009 New Revision: 55743 URL: http://svn.opensuse.org/viewcvs/yast?rev=55743&view=rev Log: - changed parameter type Modified: trunk/storage/libstorage/src/Graph.cc Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Wed Feb 25 12:55:27 2009 @@ -56,7 +56,7 @@ struct Rank { - Rank(NodeType type, const string& name) + Rank(NodeType type, const char* name) : type(type), name(name) {} -- 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] r55742 - /tags/stable-2_18_12/network/
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 18:25:52 2009 New Revision: 55742 URL: http://svn.opensuse.org/viewcvs/yast?rev=55742&view=rev Log: Created tag stable-2_18_12 for network Added: tags/stable-2_18_12/network/ - copied from r55741, trunk/network/ -- 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] r55741 - in /trunk/network: VERSION package/yast2-network.changes src/lan/virtual.ycp src/modules/LanItems.ycp
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 18:25:42 2009 New Revision: 55741 URL: http://svn.opensuse.org/viewcvs/yast?rev=55741&view=rev Log: possible to not use LABEL for aliases (bnc#471253) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/virtual.ycp trunk/network/src/modules/LanItems.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=55741&r1=557… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Feb 24 18:25:42 2009 @@ -1 +1 @@ -2.18.11 +2.18.12 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Feb 24 18:25:42 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 24 18:22:06 CET 2009 - mzugec(a)suse.cz + +- possible to not use LABEL for aliases (bnc#471253) +- 2.18.12 + +------------------------------------------------------------------- Mon Feb 23 13:52:21 CET 2009 - mzugec(a)suse.cz - correctly write modem configuration in case of edit (bnc#465371) Modified: trunk/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/virtual.ycp?rev=… ============================================================================== --- trunk/network/src/lan/virtual.ycp (original) +++ trunk/network/src/lan/virtual.ycp Tue Feb 24 18:25:42 2009 @@ -60,17 +60,17 @@ void initAdditional (string key) { - //#165059 if (NetworkService::IsManaged()) UI::ChangeWidget(`f_additional, `Enabled, false); list<term> table_items = []; /* make ui items from the aliases list */ maplist(string alias, map data, (map<string,map>) LanItems::aliases, { + string label = data["LABEL"]:""; string ip = data["IPADDR"]:""; string mask = data["NETMASK"]:""; if (size(data["PREFIXLEN"]:"")>0) mask=sformat("/%1", data["PREFIXLEN"]:""); - table_items = add(table_items, `item(`id(size(table_items)), alias, ip, mask)); + table_items = add(table_items, `item(`id(size(table_items)), label, ip, mask)); }); UI::ChangeWidget(`id(`table), `Items, table_items); @@ -137,10 +137,11 @@ maplist(term e, table_items, { map alias = $[]; alias["IPADDR"] = e[2]:""; + if (size(e[1]:"")>0) alias["LABEL"]=e[1]:""; if(substring(e[3]:"", 0,1)=="/") alias["PREFIXLEN"]=substring(e[3]:"", 1); else alias["NETMASK"]=e[3]:""; - LanItems::aliases[e[1]:""] = alias; - aliases_to_delete[e[1]:""] = nil; + LanItems::aliases[tostring(size(LanItems::aliases))] = alias; +// aliases_to_delete[tostring(size(LanItems::aliases))] = nil; }); foreach (string a, any v, (map <string, any>)aliases_to_delete, { if (v != nil) { NetworkInterfaces::DeleteAlias (NetworkInterfaces::Name, a); } @@ -205,12 +206,13 @@ UI::SetFocus(`id(`name)); continue; } +/* if(contains(forbidden, val)) { - /* Popup::Error text */ Popup::Error(sformat(_("IP address %1 is already present."), val)); UI::SetFocus(`id(`host)); continue; } +*/ host = add(host, val); val = (string) UI::QueryWidget(`id(`ipaddr), `Value); Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Tue Feb 24 18:25:42 2009 @@ -46,6 +46,7 @@ global string type = ""; global string device = ""; +//FIXME: always empty string - remove all occuriences global string alias = ""; global integer current = -1; global string hotplug = ""; @@ -496,8 +497,8 @@ // build aliases overview if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) NetworkInterfaces::Current["_aliases"]:$[], { - string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:""); - bullets = add(bullets, sformat("%1 (%2)", key, parameters) ); + string parameters = sformat("%1/%2", desc["IPADDR"]:"", desc["PREFIXLEN"]:""); + bullets = add(bullets, sformat("%1 (%2)", desc["LABEL"]:"", parameters) ); }); } } -- 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] r55740 - /tags/stable-2_18_12/yast2/
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 18:25:21 2009 New Revision: 55740 URL: http://svn.opensuse.org/viewcvs/yast?rev=55740&view=rev Log: Created tag stable-2_18_12 for yast2 Added: tags/stable-2_18_12/yast2/ - copied from r55739, trunk/yast2/ -- 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] r55739 - /tags/stable-2_18_12/
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 18:25:19 2009 New Revision: 55739 URL: http://svn.opensuse.org/viewcvs/yast?rev=55739&view=rev Log: Created tag stable-2_18_12 Added: tags/stable-2_18_12/ -- 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] r55738 - in /trunk/yast2: VERSION library/network/src/NetworkInterfaces.ycp package/yast2.changes
by mzugec＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: mzugec Date: Tue Feb 24 18:24:59 2009 New Revision: 55738 URL: http://svn.opensuse.org/viewcvs/yast?rev=55738&view=rev Log: - NetworkInterfaces - possible to not use LABEL for aliases (bnc#471253) Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=55738&r1=55737… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Feb 24 18:24:59 2009 @@ -1 +1 @@ -2.18.11 +2.18.12 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Tue Feb 24 18:24:59 2009 @@ -698,7 +698,7 @@ path base = add (.network.value, dev); // look in OriginalDevs because we need to catch all variables // of the alias - foreach (string key, any dummy, OriginalDevs[typ, num, "_aliases", anum]:$[], { + foreach (string key, any dummy, OriginalDevs[typ, dev, "_aliases", anum]:$[], { path p = add (base, key + "_" + anum); y2debug ("deleting: %1", p); SCR::Write (p, nil); @@ -739,7 +739,7 @@ // writing, but we create it in 2 ways so it's // better here. Actually it does not work because // the edit dialog nukes LABEL :-( - boolean seen_label = false; +// boolean seen_label = false; if (size(amap["IPADDR"]:"")>0 && size(amap["NETMASK"]:"")>0){ amap["IPADDR"] = sformat("%1/%2", amap["IPADDR"]:"", Netmask::ToBits(amap["NETMASK"]:"")); amap=remove(amap, "NETMASK"); @@ -755,13 +755,14 @@ maplist(string ak, string av, amap, { string akk = ak + "_" + anum; ShellSafeWrite (topath (p + akk), av); - seen_label = seen_label || ak == "LABEL"; +// seen_label = seen_label || ak == "LABEL"; }); - +/* if (!seen_label) { ShellSafeWrite (topath (p + ("LABEL_" + anum)), anum); } +*/ }); } /* Write regular keys */ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 24 18:24:59 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 24 18:24:42 CET 2009 - mzugec(a)suse.cz + +- - NetworkInterfaces - possible to not use LABEL for aliases +(bnc#471253) +- 2.18.12 + +------------------------------------------------------------------- Tue Feb 24 14:34:50 CET 2009 - locilka(a)suse.cz - Added support for `reboot_same_step return value (bnc #475650). -- 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] r55737 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines: common_options.ycp dialogs_i386.ycp grub_options.ycp
by jreidinger＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: jreidinger Date: Tue Feb 24 18:09:43 2009 New Revision: 55737 URL: http://svn.opensuse.org/viewcvs/yast?rev=55737&view=rev Log: enable run of new global options fix various warnings add gfx menu chooser Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/common_options.ycp Tue Feb 24 18:09:43 2009 @@ -19,7 +19,7 @@ textdomain "bootloader"; -void InitGlobalBool(string widget, map event){ +void InitGlobalBool(string widget){ boolean value = false; if (BootCommon::globals[widget]:"false" == "true"){ value = true; @@ -36,7 +36,7 @@ } } -void CommonCheckboxWidget(string label, string help){ +map<string,any> CommonCheckboxWidget(string label, string help){ return $[ "widget" : `checkbox, "label" : label, @@ -50,20 +50,20 @@ integer value = tointeger(BootCommon::globals[widget]:"0"); UI::ChangeWidget (`id (widget), `Value, value); } -void StoreGlobalInt(string widget){ +void StoreGlobalInt(string widget, map event){ integer value = (integer)UI::QueryWidget (`id (widget), `Value); - BootCommon::globals[widget] = sformat ("%1", timeout); + BootCommon::globals[widget] = sformat ("%1", value); } map<string,any> TimeoutWidget () { return $[ "widget" : `intfield, - "label" : _("Boot Menu"), + "label" : _("&Timeout"), "minimum" : 0, "maximum" : 300, "init" : InitGlobalInt, "store" : StoreGlobalInt, - //"help" : i386BootMenuHelp (), //TODO + "help" : "", //TODO ]; } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs_i386.ycp Tue Feb 24 18:09:43 2009 @@ -28,6 +28,7 @@ include "bootloader/routines/helps_i386.ycp"; include "bootloader/routines/widgets_i386.ycp"; +include "bootloader/routines/grub_options.ycp"; @@ -62,26 +63,34 @@ term contents = `HBox (`HSpacing (2), `VBox ( `VStretch (), - "boot_menu", + "activate", `VStretch (), - "password", + "debug", + `VStretch (), + "generic_mbr", + `VStretch (), + "trusted_grub", + `VStretch (), + "hiddenmenu", + `VStretch (), + "gfxmenu", + `VStretch (), + "timeout", `VStretch () + ), `HSpacing (2)); - list<string> widget_names = ["boot_menu", "password"]; - map<string,map<string,any> > widget_descr = (map<string,map<string,any> >) - i386Widgets (); - // dialog caption + list<string> widget_names = ["activate","debug","generic_mbr", + "trusted_grub","hiddenmenu","gfxmenu","timeout"]; string caption = _("Boot Loader Options"); return CWM::ShowAndRun ($[ - "widget_descr" : widget_descr, + "widget_descr" : GrubOptions(), "widget_names" : widget_names, "contents" : contents, "caption" : caption, "back_button" : Label::BackButton (), "abort_button" : Label::AbortButton (), "next_button" : Label::OKButton (), -// "fallback_functions" : section_handlers, ]); } Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/grub_options.ycp Tue Feb 24 18:09:43 2009 @@ -19,27 +19,69 @@ textdomain "bootloader"; -include "bootloader/routines/common_widget.ycp"; +include "bootloader/routines/common_options.ycp"; + +void InitGfx(string widget){ + UI::ChangeWidget(`id(`gfxinput),`Value,BootCommon::globals[widget]:""); +} + +void StoreGfx(string widget, map event){ + string result = (string)UI::QueryWidget(`id(`gfxinput),`Value); + if (result == ""){ + BootCommon::global_options = remove(BootCommon::global_options, widget); + } else { + BootCommon::global_options[widget] = result; + } +} + +symbol HandleGfx(string widget, map event){ + string file = UI::AskForExistingFile("/boot", "", + _("Choose new graphical menu file")); + + if (file != nil){ + UI::ChangeWidget(`id(`gfxinput),`Value,file); + } + + return nil; +} + +map<string,any> GfxWidget(){ + return $[ + "widget" : `custom, + "custom_widget" : `HBox(`Left(`InputField(`id(`gfxinput),_("&Graphical Menu File"))), + `VBox( + `Left(`Label("")), + `Left(`PushButton(`id(`browsegfx),`opt(`notify), _("Brows&e"))) + ) + ), + "init" : InitGfx, + "store" : StoreGfx, + "handle" : HandleGfx, + "handle_events" : [`browsegfx], + "help" : "" + ]; +} //TODO // check if works translated global variables // helps for widgets const string activateLabel = - _("Set active Flag in Partition Table for Boot Partition"); -const string debugLabel = _("Debugging Flag"); -const string genericLabel = _("Write generic Boot Code to MBR"); -const string trustedLabel = _("Use Trusted Grub"); -const string hiddenLabel = _("Hide Menu on Boot"); + _("&Set active Flag in Partition Table for Boot Partition"); +const string debugLabel = _("&Debugging Flag"); +const string genericLabel = _("&Write generic Boot Code to MBR"); +const string trustedLabel = _("&Use Trusted Grub"); +const string hiddenLabel = _("&Hide Menu on Boot"); -map<map<string,any> > GrubOptions(){ - map<map<string,any> > grub_specific = $[ +map<string,map<string,any> > GrubOptions(){ + map<string,map<string,any> > grub_specific = $[ "activate" : CommonCheckboxWidget(activateLabel,""), "debug" : CommonCheckboxWidget(debugLabel,""), "generic_mbr" : CommonCheckboxWidget(genericLabel,""), - "trusted_grub" : CommonCheckboxWidget(trusted_grub,""), + "trusted_grub" : CommonCheckboxWidget(trustedLabel,""), "hiddenmenu" : CommonCheckboxWidget(hiddenLabel,""), + "gfxmenu" : GfxWidget(), ]; - return (map<map<string,any> >)union(grub_specific,CommonOptions()); + return (map<string,map<string,any> >)union(grub_specific,CommonOptions()); } } -- 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] r55736 - in /trunk/sshd: package/yast2-sshd.changes src/dialogs.ycp src/helps.ycp
by locilka＠svn.opensuse.org 24 Feb '09

24 Feb '09

Author: locilka Date: Tue Feb 24 16:46:10 2009 New Revision: 55736 URL: http://svn.opensuse.org/viewcvs/yast?rev=55736&view=rev Log: - Added Login Settings help and improved the current dialog labels to be more accurate (bnc #470357). Modified: trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/dialogs.ycp trunk/sshd/src/helps.ycp Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Tue Feb 24 16:46:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 24 16:44:38 CET 2009 - locilka(a)suse.cz + +- Added Login Settings help and improved the current dialog labels + to be more accurate (bnc #470357).` + +------------------------------------------------------------------- Thu Jan 29 10:50:10 CET 2009 - locilka(a)suse.cz - Dropping possibility to adjust PasswordAuthentication option Modified: trunk/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=55736&r… ============================================================================== --- trunk/sshd/src/dialogs.ycp (original) +++ trunk/sshd/src/dialogs.ycp Tue Feb 24 16:46:10 2009 @@ -89,9 +89,9 @@ // `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), /* A check box */ - `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), + `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation (Protocol V. 1 Only)"))), /* A check box */ - `Left(`CheckBox (`id("PubkeyAuthentication"), _("Public &Key Authentication"))) + `Left(`CheckBox (`id("PubkeyAuthentication"), _("Public &Key Authentication (Protocol V. 2 Only)"))) )) ), `VStretch() Modified: trunk/sshd/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/helps.ycp?rev=55736&r1=… ============================================================================== --- trunk/sshd/src/helps.ycp (original) +++ trunk/sshd/src/helps.ycp Tue Feb 24 16:46:10 2009 @@ -26,9 +26,34 @@ "server_configuration" : _("<big>Server Configuration</big> Configure SSHD here. "), - /* Login Settings dialog help */ + /* Login Settings dialog help 1 */ "login_settings" : _("<big>Login Settings</big> -Configure SSHD login settings here. "), +Here you can configure the SSHD login and authentication settings. +Some apply to a particular protocol version only.") + + /* Login Settings dialog help 2, text taken from sshd_config manpage */ + + _("Print Message of the Day After Login +Specifies whether sshd should print /etc/motd when +a user logs in interactively.") + + /* Login Settings dialog help 3, text taken from sshd_config manpage */ + + _("Permit Root Login +Specifies whether root can log in using ssh.") + + /* Login Settings dialog help 4, text taken from sshd_config manpage */ + + _("Maximum Authentication Tries +Specifies the maximum number of authentication attempts permitted per connection. +Once the number of failures reaches half this value, additional failures are logged.") + + /* Login Settings dialog help 5, text taken from sshd_config manpage */ + + _("RSA Authentication +Specifies whether pure RSA authentication is allowed. +This option applies to protocol version 1 only.") + + /* Login Settings dialog help 6, text taken from sshd_config manpage */ + + _("Public Key Authentication +Specifies whether public key authentication is allowed. +This option applies to protocol version 2 only."), /* Protocol and Cipher Settings dialog help*/ "proto_settings" : _("<big>Protocol and Cipher Settings</big> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0