April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67984 - in /trunk/bootloader/src: grub2/Makefile.am grub2/dialogs.ycp modules/BootGRUB2.ycp routines/global_widgets.ycp
by snwint＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: snwint Date: Mon Apr 23 11:46:27 2012 New Revision: 67984 URL: http://svn.opensuse.org/viewcvs/yast?rev=67984&view=rev Log: - add "Boot Loader Options" dialog for grub2 that provides widgets for manipulating global options. These options include activate, generic_mbr, timeout, vgamode, append and default. Modified: trunk/bootloader/src/grub2/Makefile.am trunk/bootloader/src/grub2/dialogs.ycp trunk/bootloader/src/modules/BootGRUB2.ycp trunk/bootloader/src/routines/global_widgets.ycp Modified: trunk/bootloader/src/grub2/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub2/Makefile.am… ============================================================================== --- trunk/bootloader/src/grub2/Makefile.am (original) +++ trunk/bootloader/src/grub2/Makefile.am Mon Apr 23 11:46:27 2012 @@ -4,8 +4,10 @@ yncludedir = @yncludedir@/bootloader/grub2 -ynclude_DATA = \ - dialogs.ycp +ynclude_DATA = \ + dialogs.ycp \ + options.ycp \ + helps.ycp EXTRA_DIST = \ $(ynclude_DATA) Modified: trunk/bootloader/src/grub2/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub2/dialogs.ycp… ============================================================================== --- trunk/bootloader/src/grub2/dialogs.ycp (original) +++ trunk/bootloader/src/grub2/dialogs.ycp Mon Apr 23 11:46:27 2012 @@ -26,6 +26,46 @@ import "BootCommon"; import "Stage"; +include "bootloader/grub2/options.ycp"; + +/** + * Run dialog for loader installation details for Grub2 + * @return symbol for wizard sequencer + */ +symbol Grub2LoaderDetailsDialog () +{ + y2milestone ("Running Grub2 loader details dialog"); + term contents = `HBox ( + `HSpacing (2), + `VBox ( + `VStretch (), + `Left("activate"), + `Left("generic_mbr"), + `Left("hiddenmenu"), + `HBox ( + `Left(`HSquash("timeout")), + `Left(`HWeight(1, "vgamode")) + ), + `Left("append"), + `Left("default"), + `VStretch () + ), + `HSpacing (2) + ); + + list<string> widget_names = ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "vgamode", "default"]; + string caption = _("Boot Loader Options"); + return CWM::ShowAndRun ($[ + "widget_descr" : Grub2Options(), + "widget_names" : widget_names, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton (), + ]); +} + include "bootloader/grub/options.ycp"; /** Modified: trunk/bootloader/src/modules/BootGRUB2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB2… ============================================================================== --- trunk/bootloader/src/modules/BootGRUB2.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB2.ycp Mon Apr 23 11:46:27 2012 @@ -43,6 +43,16 @@ // general functions /** + * Propose global options of bootloader + */ +global map<string,string> StandardGlobals () { + return $[ + "timeout" : "8", + "default" : "0", + ]; +} + +/** * Read settings from disk * @param reread boolean true to force reread settings from system * @param avoid_reading_device_map do not read new device map from file, use @@ -121,6 +131,12 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + + if (BootCommon::globals == nil || size (BootCommon::globals) == 0) + { + BootCommon::globals = StandardGlobals(); + } + grub_LocationProposal (); map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); @@ -177,6 +193,13 @@ return result; } +global map<string,symbol()> Dialogs () { + y2milestone ("Called GRUB2 Dialogs"); + return $[ + "loader" : Grub2LoaderDetailsDialog, + ]; +} + /** * Return map of provided functions * @return a map of functions (eg. $["write":BootGRUB2::Write]) @@ -189,6 +212,7 @@ "summary" : Summary, "update" : Update, "widgets" : grub2Widgets, + "dialogs" : Dialogs, "write" : Write, ]; } Modified: trunk/bootloader/src/routines/global_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/global_w… ============================================================================== --- trunk/bootloader/src/routines/global_widgets.ycp (original) +++ trunk/bootloader/src/routines/global_widgets.ycp Mon Apr 23 11:46:27 2012 @@ -736,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2" || lt == "grub2-efi") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2-efi") ? `Empty() : "loader_options" ), `HSpacing (2) -- 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] r67983 - /trunk/bootloader/package/yast2-bootloader.changes
by snwint＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: snwint Date: Mon Apr 23 11:35:32 2012 New Revision: 67983 URL: http://svn.opensuse.org/viewcvs/yast?rev=67983&view=rev Log: (empty) Modified: trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Apr 23 11:35:32 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Apr 23 11:35:06 CEST 2012 - snwint(a)suse.de + +- adapted ssh command for 2nd stage ssh installation (bnc#745340) + +------------------------------------------------------------------- Thu Mar 22 10:56:28 UTC 2012 - mchang(a)suse.com - add kernel parameters (detected necessary and user specfied one during -- 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] r67982 - /trunk/proxy/yast2-proxy.spec.in
by mvidner＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: mvidner Date: Mon Apr 23 11:28:44 2012 New Revision: 67982 URL: http://svn.opensuse.org/viewcvs/yast?rev=67982&view=rev Log: include the include directory in the rpm Modified: trunk/proxy/yast2-proxy.spec.in Modified: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67… ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (original) +++ trunk/proxy/yast2-proxy.spec.in Mon Apr 23 11:28:44 2012 @@ -36,6 +36,7 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +@yncludedir@/proxy @desktopdir@/*.desktop @scrconfdir@/*.scr @schemadir@/autoyast/rnc/proxy.rnc -- 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] r67981 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: jsuchome Date: Mon Apr 23 11:25:34 2012 New Revision: 67981 URL: http://svn.opensuse.org/viewcvs/yast?rev=67981&view=rev Log: start lxc always as deamon, than allow console login Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Mon Apr 23 11:25:34 2012 @@ -293,41 +293,17 @@ void StartContainer (string name) { - string cmd = sformat ("xterm -e lxc-start -n %1", name); + // start container as a deamon, so it survives YaST's exit + string cmd = sformat ("lxc-start -d -n %1", name); - if (Lxc::textmode) - { - cmd = sformat ("lxc-start -d -n %1", name); - } - - integer id = (integer) SCR::Execute (.process.start_shell, cmd); - /* - UI::ReplaceWidget (`id (`rpbutton), - `PushButton (`id (`cancel), Label::CancelButton ()) - ); - */ - if (Lxc::textmode) - { - // message - Popup::Message (sformat (_("The Container '%1' was started in the background. + map out = (map) SCR::Execute (.target.bash_output, cmd); + // FIXME check exit + if (Lxc::textmode) + { + // message + Popup::Message (sformat (_("The Container '%1' was started in the background. Use 'lxc-console' command to connect to the running Container."), name)); - } - while (true) - { - symbol ui = (symbol) UI::PollInput(); - if (SCR::Read(.process.running, id) != true) - { - break; - } -// FIXME nothing else could be clicked now, closing YaST probably means killing all bg processes - if (ui == `stop) - { - y2internal ("lxc-stop: %1", - SCR::Execute (.target.bash_output, "lxc-stop -n " + name) - ); - break; - } - } + } } void StopContainer (string name) @@ -358,6 +334,16 @@ } } +// Launch console for selected container +integer Connect (string name) +{ + string cmd = sformat ("xterm -e lxc-console -n %1", name); + + integer pid = (integer) SCR::Execute (.process.start_shell, cmd); + + return pid; +} + /** * Overview of existing Linux Containers * @return dialog result @@ -366,8 +352,17 @@ // LXC overview dialog caption string caption = _("LXC Configuration"); + integer console_pid = -1; + list<term> lxc_list = []; - list<term> lxc_list = Lxc::GetContainers ();; + void update_table () { + + lxc_list = Lxc::GetContainers ();; + UI::ChangeWidget (`id (`table), `Items, lxc_list); + foreach (any t, [ `table, `destroy, `start, `stop ], { + UI::ChangeWidget (`id (t), `Enabled, size (lxc_list) > 0); + }); + } term contents = `HBox (`HSpacing (), `VBox ( `VSpacing (), @@ -380,17 +375,22 @@ // button label `Right (`PushButton (`id (`start), _("&Start"))), // button label - `PushButton (`id (`stop), _("Sto&p")) + `PushButton (`id (`stop), _("Sto&p")), + `ReplacePoint (`id (`rp_console), + Lxc::textmode ? `HBox () : + // button label + `PushButton (`id (`connect), _("Connect")) + ) ), `VSpacing () ), `HSpacing ()); + // FIXME add Refresh Table button + Wizard::SetContentsButtons(caption, contents, "overview", Label::BackButton(), Label::FinishButton()); - foreach (any t, [ `table, `destroy, `start ], { - UI::ChangeWidget (`id (t), `Enabled, size (lxc_list) > 0); - }); + update_table (); any ret = nil; while(true) { @@ -409,18 +409,41 @@ if (ret == `start) { StartContainer (selected); + update_table (); + continue; + } + + if (ret == `connect) { + // FIXME solve more consoles running + console_pid = Connect (selected); + UI::ReplaceWidget (`id (`rp_console), + // button label + `PushButton (`id (`disconnect), _("Disconnect")) + ); + continue; + } + + if (ret == `disconnect && console_pid != -1) { + SCR::Execute (.process.kill, console_pid, 15); + // FIXME timeout + kill -9 + console_pid = -1; + UI::ReplaceWidget (`id (`rp_console), + // button label + `PushButton (`id (`connect), _("Connect")) + ); continue; } if (ret == `stop) { StopContainer (selected); + update_table (); continue; } if (ret == `destroy) { // FIXME ask for confirmation DestroyContainer (selected); - // FIXME adapt the table + update_table (); continue; } } -- 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] r67980 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp
by jsuchome＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: jsuchome Date: Mon Apr 23 10:46:41 2012 New Revision: 67980 URL: http://svn.opensuse.org/viewcvs/yast?rev=67980&view=rev Log: show each lxc only once Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Mon Apr 23 10:46:41 2012 @@ -92,17 +92,20 @@ global list<term> GetContainers () { - list<term> ret = []; + list<term> ret = []; + map lxc_index = $[]; + map out = (map) SCR::Execute (.target.bash_output, "lxc-ls -1"); foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { - if (line != "") + if (line != "" && !haskey (lxc_index, line)) { string cmd= sformat ("lxc-info -n %1 | grep state", line); out = (map) SCR::Execute (.target.bash_output, cmd, $[ "LANG" : "C" ]); list<string> state = splitstring (deletechars (out["stdout"]:"", " \t\n"), ":"); ret = add (ret, `item (line, state[1]:"")); // FIXME translate + lxc_index[line] = true; } }); return ret; -- 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] r67979 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: jsuchome Date: Mon Apr 23 09:56:43 2012 New Revision: 67979 URL: http://svn.opensuse.org/viewcvs/yast?rev=67979&view=rev Log: enable using existing config Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Mon Apr 23 09:56:43 2012 @@ -41,6 +41,56 @@ import "Wizard"; +boolean CreateContainerConfig (string name, string ip, string subnet, string bridge, string template) +{ + // busy message + Popup::ShowFeedback ("", _("Creating Configuration...")); + + // lxc-createconfig -n <name> [-i <ipaddr/cidr>] [-b <bridge>] [-t <template] + string cmd = sformat ("echo 'y' | lxc-createconfig -n %1", name); + if (ip != "") + { + cmd = cmd + " -i " + ip; + if (subnet != "") + { + if (substring (subnet, 0, 1) != "/") + { + cmd = cmd + "/"; + } + cmd = cmd + subnet; + } + } + + if (bridge != "") + { + cmd = cmd + " -b " + bridge; + } + + if (template != "") + { + cmd = cmd + " -t " + template; + } + + y2internal ("cmd: %1", cmd); + + map out = (map) SCR::Execute (.target.bash_output, cmd); + + y2internal ("out: %1", out); + + Popup::ClearFeedback (); + + if (out["exit"]:0 != 0) + { + // error message + Report::Error (sformat (_("Error occured during configuration: + +%1"), out["stdout"]:"")); + return false; + } + + return true; +} + /** * Adding new Linux Container * @return dialog result @@ -163,48 +213,32 @@ if (ret == `next) { - // busy message - Popup::ShowFeedback ("", _("Creating Configuration...")); + string config_file = sformat ("/root/%1.config", name); + boolean create_config = true; - // lxc-createconfig -n <name> [-i <ipaddr/cidr>] [-b <bridge>] [-t <template] - string cmd = sformat ("echo 'y' | lxc-createconfig -n %1", name); - if (ip != "") + if (FileUtils::Exists (config_file)) { - cmd = cmd + " -i " + ip; - if (subnet != "") + if (!Popup::AnyQuestion (Popup::NoHeadline(), + // yes/no popup +_("Configuration with the same name already exist. + +Do you want to use existing configuration or +remove it and use the data you have just entered? +"), + // button label + _("Use Existing Configuration"), _("Replace With New"), `focus_yes)) { - if (substring (subnet, 0, 1) != "/") - { - cmd = cmd + "/"; - } - cmd = cmd + subnet; + SCR::Execute (.target.remove, config_file); + } + else + { + create_config = false; } } - if (bridge != "") - { - cmd = cmd + " -b " + bridge; - } - - if (template != "") - { - cmd = cmd + " -t " + template; - } - - y2internal ("cmd: %1", cmd); - - map out = (map) SCR::Execute (.target.bash_output, cmd); - - y2internal ("out: %1", out); - - Popup::ClearFeedback (); - - if (out["exit"]:0 != 0) + if (create_config && + CreateContainerConfig (name, ip, subnet, bridge, template) == false) { - // error message - Report::Error (sformat (_("Error occured during configuration: - -%1"), out["stdout"]:"")); continue; } @@ -212,14 +246,14 @@ Popup::ShowFeedback ("", sformat (_("Creating Container %1..."), name)); // lxc-create -n <name> -f /root/<name>.config -t <template> - cmd = sformat ("lxc-create -n %1 -f /root/%1.config", name); + string cmd = sformat ("lxc-create -n %1 -f /root/%1.config", name); if (template != "") { cmd = cmd + " -t " + template; } y2internal ("cmd: %1", cmd); - out = (map) SCR::Execute (.target.bash_output, cmd); + map out = (map) SCR::Execute (.target.bash_output, cmd); y2internal ("out: %1", out); -- 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] r67978 - /branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp
by jsuchome＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: jsuchome Date: Mon Apr 23 09:56:00 2012 New Revision: 67978 URL: http://svn.opensuse.org/viewcvs/yast?rev=67978&view=rev Log: read status of container Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Mon Apr 23 09:56:00 2012 @@ -94,14 +94,15 @@ list<term> ret = []; map out = (map) SCR::Execute (.target.bash_output, "lxc-ls -1"); -out["stdout"] = "suse1\nsles\n"; + foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { if (line != "") { string cmd= sformat ("lxc-info -n %1 | grep state", line); out = (map) SCR::Execute (.target.bash_output, cmd, $[ "LANG" : "C" ]); - // FIXME read status - ret = add (ret, `item (line, _("Stopped"))); + list<string> state = splitstring (deletechars (out["stdout"]:"", " \t\n"), ":"); + ret = add (ret, `item (line, state[1]:"")); + // FIXME translate } }); return ret; -- 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] r67977 - in /branches/SuSE-Code-11-SP2-Branch/lxc/src: Lxc.ycp Makefile.am dialogs.ycp lxc.ycp wizards.ycp
by jsuchome＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: jsuchome Date: Fri Apr 20 17:28:41 2012 New Revision: 67977 URL: http://svn.opensuse.org/viewcvs/yast?rev=67977&view=rev Log: enhanced workflow: showing list of lxc moving code to module still WIP Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp (with props) Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Lxc.ycp Fri Apr 20 17:28:41 2012 @@ -36,106 +36,76 @@ textdomain "lxc"; import "Progress"; -import "Report"; -import "Summary"; -import "Message"; +import "Security"; -/** - * Prototypes - */ -global boolean Modified(); - -/** - * Data was modified? - */ -boolean modified = false; - -/** - */ -boolean proposal_valid = false; - -/** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -boolean write_only = false; -/** - * Abort function - * return boolean return true if abort - */ -boolean() AbortFunction = Modified; +// text or graphic mode? +global boolean textmode = false; -/** - * Abort function - * @return boolean return true if abort - */ -global define boolean Abort() ``{ - if(AbortFunction != nil) - { - return AbortFunction () == true; - } - return false; -} +// current password encryption method +string method = "des"; -/** - * Data was modified? - * @return true if modified - */ -global boolean Modified() { - y2debug("modified=%1",modified); - return modified; -} - -/** - * Mark as modified, for Autoyast. - */ -global void SetModified(boolean value) { - modified = true; +// read list of available templates +global list<term> ReadTemplates () { + + list<term> ret = []; + map out = (map) SCR::Execute (.target.bash_output, "rpm -ql lxc | grep 'templates/' | cut -f 2 -d -"); + if (out["stdout"]:"" != "") + { + foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { + if (line != "") + { + ret = add (ret, + // sles goes later = selected if present + `item (line, line == "sles" || line == "opensuse")); + } + }); } - -global boolean ProposalValid() { - return proposal_valid; + return ret; } -global void SetProposalValid(boolean value) { - proposal_valid = value; -} +// encrypt given password using current method +global string CryptPassword (string pw) { -/** - * @return true if module is marked as "write only" (don't start services etc...) - */ -global boolean WriteOnly() { - return write_only; + if (method == "md5") + return cryptmd5 (pw); + if (method == "blowfish") + return cryptblowfish (pw); + if (method == "sha256") + return cryptsha256 (pw); + if (method == "sha512") + return cryptsha512 (pw); + return crypt (pw); } -/** - * Set write_only flag (for autoinstalation). - */ -global void SetWriteOnly(boolean value) { - write_only = value; -} +global list<string> ReadBridgesIds () { + map out = (map) SCR::Execute (.target.bash_output, "brctl show | tail -n +2 | cut -f 1"); + list<string> ret = []; -global void SetAbortFunction(boolean() function) { - AbortFunction = function; + if (out["stdout"]:"" != "") + { + ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + } + return ret; } +global list<term> GetContainers () { -// Settings: Define all variables needed for configuration of lxc -// TODO FIXME: Define all the variables necessary to hold -// TODO FIXME: the configuration here (with the appropriate -// TODO FIXME: description) -// TODO FIXME: For example: -// /** -// * List of the configured cards. -// */ -// list cards = []; -// -// /** -// * Some additional parameter needed for the configuration. -// */ -// boolean additional_parameter = true; + list<term> ret = []; + map out = (map) SCR::Execute (.target.bash_output, "lxc-ls -1"); +out["stdout"] = "suse1\nsles\n"; + foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { + if (line != "") + { + string cmd= sformat ("lxc-info -n %1 | grep state", line); + out = (map) SCR::Execute (.target.bash_output, cmd, $[ "LANG" : "C" ]); + // FIXME read status + ret = add (ret, `item (line, _("Stopped"))); + } + }); + return ret; +} /** * Read all lxc settings @@ -144,180 +114,49 @@ global boolean Read() { /* Lxc read dialog caption */ - string caption = _("Initializing lxc Configuration"); - - // TODO FIXME Set the right number of stages - integer steps = 4; + string caption = _("Initializing LXC Configuration"); - integer sl = 500; - sleep(sl); + integer steps = 2; - // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Read the database"), - /* Progress stage 2/3 */ - _("Read the previous settings"), - /* Progress stage 3/3 */ - _("Detect the devices") + // Progress stage + _("Check LXC availability"), + // Progress stage + _("Read system settings"), ], [ - /* Progress step 1/3 */ - _("Reading the database..."), - /* Progress step 2/3 */ - _("Reading the previous settings..."), - /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ + // Progress step + _("Check LXC availability..."), + // Progress step + _("Reading system settings..."), + // Progress finished _("Finished") ], "" ); - // read database - if(Abort()) return false; - Progress::NextStage(); - /* Error message */ - if(false) Report::Error(_("Cannot read database1.")); - sleep(sl); - - // read another database - if(Abort()) return false; - Progress::NextStep(); - /* Error message */ - if(false) Report::Error(_("Cannot read database2.")); - sleep(sl); - // read current settings - if(Abort()) return false; Progress::NextStage(); - /* Error message */ - if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); - // detect devices - if(Abort()) return false; - Progress::NextStage(); - /* Error message */ - if(false) Report::Warning(_("Cannot detect devices.")); - sleep(sl); + // FIXME run lxc-checkconfig at start - if(Abort()) return false; - /* Progress finished */ Progress::NextStage(); - sleep(sl); - if(Abort()) return false; - modified = false; - return true; -} + boolean orig = Progress::set (false); -/** - * Write all lxc settings - * @return true on success - */ -global boolean Write() { + Security::Read (); - /* Lxc read dialog caption */ - string caption = _("Saving lxc Configuration"); + Progress::set (orig); - // TODO FIXME And set the right number of stages - integer steps = 2; + map security = Security::Export (); + method = tolower (security["PASSWD_ENCRYPTION"]:"des"); - integer sl = 500; - sleep(sl); + textmode = UI::GetDisplayInfo()["TextMode"]:false; - // TODO FIXME Names of real stages - // We do not set help text here, because it was set outside - Progress::New(caption, " ", steps, [ - /* Progress stage 1/2 */ - _("Write the settings"), - /* Progress stage 2/2 */ - _("Run SuSEconfig") - ], [ - /* Progress step 1/2 */ - _("Writing the settings..."), - /* Progress step 2/2 */ - _("Running SuSEconfig..."), - /* Progress finished */ - _("Finished") - ], - "" - ); - - // write settings - if(Abort()) return false; Progress::NextStage(); - /* Error message */ - if(false) Report::Error (_("Cannot write settings.")); - sleep(sl); - - // run SuSEconfig - if(Abort()) return false; - Progress::NextStage (); - /* Error message */ - if(false) Report::Error (Message::SuSEConfigFailed()); - sleep(sl); - - if(Abort()) return false; - /* Progress finished */ - Progress::NextStage(); - sleep(sl); - - if(Abort()) return false; - return true; -} -/** - * Get all lxc settings from the first parameter - * (For use by autoinstallation.) - * @param settings The YCP structure to be imported. - * @return boolean True on success - */ -global boolean Import (map settings) { - // TODO FIXME: your code here (fill the above mentioned variables)... return true; } -/** - * Dump the lxc settings to a single map - * (For use by autoinstallation.) - * @return map Dumped settings (later acceptable by Import ()) - */ -global map Export () { - // TODO FIXME: your code here (return the above mentioned variables)... - return $[]; -} - -/** - * Create a textual summary and a list of unconfigured cards - * @return summary of the current configuration - */ -global list Summary() { - // TODO FIXME: your code here... - /* Configuration summary text for autoyast */ - return [ _("Configuration summary..."), [] ]; -} - -/** - * Create an overview table with all configured cards - * @return table items - */ -global list Overview() { - // TODO FIXME: your code here... - return []; -} - -/** - * Return packages needed to be installed and removed during - * Autoinstallation to insure module has all needed software - * installed. - * @return map with 2 lists. - */ -global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; -} - /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/Makefile.am Fri Apr 20 17:28:41 2012 @@ -6,6 +6,7 @@ lxc.ycp ynclude_DATA = \ + wizards.ycp \ dialogs.ycp desktop_DATA = \ Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Fri Apr 20 17:28:41 2012 @@ -41,67 +41,16 @@ import "Wizard"; -list<term> read_templates () { - - list<term> ret = []; - map out = (map) SCR::Execute (.target.bash_output, "rpm -ql lxc | grep 'templates/' | cut -f 2 -d -"); - if (out["stdout"]:"" != "") - { - foreach (string line, splitstring (out["stdout"]:"", "\n"), { - if (line != "") - { - ret = add (ret, `item (line, line == "sles")); - } - }); - } - return ret; -} - -// encrypt given password using current method -string crypt_password (string pw, string method) { - - if (method == "md5") - return cryptmd5 (pw); - if (method == "blowfish") - return cryptblowfish (pw); - if (method == "sha256") - return cryptsha256 (pw); - if (method == "sha512") - return cryptsha512 (pw); - return crypt (pw); -} - -list<string> read_bridges_ids () { - - map out = (map) SCR::Execute (.target.bash_output, "brctl show | tail -n +2 | cut -f 1"); - list<string> ret = []; - - if (out["stdout"]:"" != "") - { - ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); - } - return ret; -} - /** - * Configure1 dialog + * Adding new Linux Container * @return dialog result */ -any LxcDialog () { - - boolean orig = Progress::set (false); - Security::Read (); - Progress::set (orig); +any AddDialog () { - map security = Security::Export (); - string method = tolower (security["PASSWD_ENCRYPTION"]:"des"); - - boolean textmode = UI::GetDisplayInfo()["TextMode"]:false; - - /* Lxc configure1 dialog caption */ - string caption = _("LXC Configuration"); + // add dialog caption + string caption = _("Adding New Container"); - list<term> template_items = read_templates (); + list<term> template_items = Lxc::ReadTemplates (); term contents = `HBox (`HSpacing (), `VBox ( `VSpacing (), @@ -124,7 +73,7 @@ `TextEntry (`id (`subnet), _("Subnet"), "/24"), `ReplacePoint (`id (`rp_lan), // combo box label - `ComboBox (`id (`bridge), _("Bridge"), read_bridges_ids ()) + `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) ) ), `VSpacing (0.5), @@ -149,39 +98,23 @@ `ReplacePoint (`id (`rp_status), `Label (`id (`status), "") ), - `VSpacing (), - `HBox ( - // button label - `PushButton (`id (`create), _("Create")), - `ReplacePoint (`id (`rpbutton), - // button label - `PushButton (`id (`start), _("Start")) - ), - // button label - `PushButton (`id (`destroy), _("Destroy")) - ) + `VSpacing () ), `HSpacing ()); string help_text = ""; - Wizard::CreateDialog(); Wizard::SetContentsButtons(caption, contents, help_text, - Label::BackButton(), Label::CloseButton()); - Wizard::HideBackButton (); - Wizard::HideAbortButton (); + // button label + Label::CancelButton(), _("Create")); UI::ChangeWidget (`id (`ip), `ValidChars, IP::ValidChars4); - foreach (any b, [ `start, `destroy ], { - UI::ChangeWidget (`id (b), `Enabled, false); - }); - any ret = nil; while(true) { ret = UI::UserInput(); - if (ret == `abort || ret == `cancel || ret == `next || ret == `back) { + if (ret == `abort || ret == `cancel || ret == `back) { break; } @@ -192,7 +125,7 @@ { UI::ReplaceWidget (`id (`rp_lan), // combo box label - `ComboBox (`id (`bridge), _("Bridge"), read_bridges_ids ()) + `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) ); } continue; @@ -228,7 +161,7 @@ continue; } - if (ret == `create) + if (ret == `next) { // busy message Popup::ShowFeedback ("", _("Creating Configuration...")); @@ -303,7 +236,7 @@ // busy message Popup::ShowFeedback ("", _("Saving Root Password...")); - string password = crypt_password (pw1, method); + string password = Lxc::CryptPassword (pw1); string file = sformat ("/var/lib/lxc/%1/rootfs/etc/shadow", name); if (pw1 != "" && FileUtils::Exists (file)) @@ -316,34 +249,30 @@ y2security ("out: %1", out); } Popup::ClearFeedback (); - foreach (any t, [ `create, `name, `ip, `subnet, `bridge, `lan, `template, `pw1, `pw2 ], { - UI::ChangeWidget (`id (t), `Enabled, false); - }); - UI::ChangeWidget (`id (`start), `Enabled, true); - UI::ChangeWidget (`id (`destroy), `Enabled, true); - UI::ReplaceWidget (`id (`rp_status), - // status text - `Label (`id (`status), sformat (_("Container '%1' was successfully created."), name)) - ); - continue; + Popup::Message (sformat (_("Container '%1' was successfully created."), name)); + break; } - if (ret == `start) - { + } + return ret; +} + + +void StartContainer (string name) +{ string cmd = sformat ("xterm -e lxc-start -n %1", name); - if (textmode) + if (Lxc::textmode) { cmd = sformat ("lxc-start -d -n %1", name); } - UI::ReplaceWidget (`id (`rp_status), `Label (`id (`status), "")); - integer id = (integer) SCR::Execute (.process.start_shell, cmd); + /* UI::ReplaceWidget (`id (`rpbutton), `PushButton (`id (`cancel), Label::CancelButton ()) ); - UI::ChangeWidget (`id (`destroy), `Enabled, false); - if (textmode) + */ + if (Lxc::textmode) { // message Popup::Message (sformat (_("The Container '%1' was started in the background. @@ -356,7 +285,8 @@ { break; } - if (ui == `cancel) +// FIXME nothing else could be clicked now, closing YaST probably means killing all bg processes + if (ui == `stop) { y2internal ("lxc-stop: %1", SCR::Execute (.target.bash_output, "lxc-stop -n " + name) @@ -364,50 +294,105 @@ break; } } - UI::ChangeWidget (`id (`destroy), `Enabled, true); - UI::ReplaceWidget (`id (`rpbutton), - `PushButton (`id (`start), _("Start")) - ); - continue; - } - if (ret == `destroy) - { - UI::ReplaceWidget (`id (`rp_status), `Label (`id (`status), "")); +} - // busy message - Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", name)); +void StopContainer (string name) +{ + y2internal ("lxc-stop: %1", + SCR::Execute (.target.bash_output, "lxc-stop -n " + name) + ); +} - string cmd = "lxc-destroy -f -n " + name; - map out = (map) SCR::Execute (.target.bash_output, cmd); +void DestroyContainer (string name) +{ + // busy message + Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", name)); - y2internal ("out: %1", out); + string cmd = "lxc-destroy -f -n " + name; + map out = (map) SCR::Execute (.target.bash_output, cmd); - Popup::ClearFeedback (); + y2internal ("out: %1", out); - if (out["exit"]:0 != 0) - { - // error message - Report::Error (sformat (_("Error while destroying: + Popup::ClearFeedback (); + + if (out["exit"]:0 != 0) + { + // error message + Report::Error (sformat (_("Error while destroying: %1"), out["stdout"]:"")); - } - else - { - foreach (any t, [ `create, `name, `ip, `subnet, `bridge, `lan, `template, `pw1, `pw2 ], { - UI::ChangeWidget (`id (t), `Enabled, true); - }); - UI::ChangeWidget (`id (`start), `Enabled, false); - UI::ChangeWidget (`id (`destroy), `Enabled, false); - } + } +} + +/** + * Overview of existing Linux Containers + * @return dialog result + */ +any OverviewDialog () { + + // LXC overview dialog caption + string caption = _("LXC Configuration"); + + list<term> lxc_list = Lxc::GetContainers ();; + + term contents = `HBox (`HSpacing (), `VBox ( + `VSpacing (), + // Table header + `Table (`id (`table), `opt (`notify), `header(_("Name"), _("Status")), lxc_list), + `HBox ( + `PushButton (`id (`add_button), `opt (`key_F3), Label::CreateButton ()), + // button label + `PushButton (`id (`destroy), `opt (`key_F5), _("&Destroy")), + // button label + `Right (`PushButton (`id (`start), _("&Start"))), + // button label + `PushButton (`id (`stop), _("Sto&p")) + ), + `VSpacing () + ), `HSpacing ()); + + Wizard::SetContentsButtons(caption, contents, "overview", + Label::BackButton(), Label::FinishButton()); + + foreach (any t, [ `table, `destroy, `start ], { + UI::ChangeWidget (`id (t), `Enabled, size (lxc_list) > 0); + }); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + if (ret == `abort || ret == `cancel || ret == `next || ret == `back) { + break; + } + + if (ret == `add_button) { + ret = `add; + break; + } + string selected = (string) UI::QueryWidget (`id (`table), `CurrentItem); + + if (ret == `start) { + StartContainer (selected); continue; } - } - UI::CloseDialog(); + if (ret == `stop) { + StopContainer (selected); + continue; + } + + if (ret == `destroy) { + // FIXME ask for confirmation + DestroyContainer (selected); + // FIXME adapt the table + continue; + } + } return ret; } - /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/lxc.ycp Fri Apr 20 17:28:41 2012 @@ -46,13 +46,14 @@ import "Summary"; import "CommandLine"; -include "lxc/dialogs.ycp"; +include "lxc/wizards.ycp"; map cmdline_description = $[ "id" : "lxc", /* Command line help text for the Xlxc module */ "help" : _("Configuration of LXC"), - "guihandler" : LxcDialog, + "guihandler" : LxcSequence, + "initialize" : Lxc::Read, "actions" : $[ ], "options" : $[ Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Fri Apr 20 17:28:41 2012 @@ -0,0 +1,114 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/lxc/wizards.ycp + * Package: Configuration of lxc + * Summary: Wizards definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +import "Confirm"; +import "Lxc"; +import "Sequencer"; +import "Wizard"; + +include "lxc/dialogs.ycp"; + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + if (!Confirm::MustBeRoot()) return `abort; + boolean ret = Lxc::Read(); + return ret ? `next : `abort; +} + +/** + * Main workflow of the lxc configuration + * @return sequence result + */ +any MainSequence() { + + map aliases = $[ + "overview" : ``( OverviewDialog() ), + "add" : ``( AddDialog() ), + ]; + + map sequence = $[ + "ws_start" : "overview", + "overview" : $[ + `abort : `abort, + `next : `next, + `add : "add", + ], + "add" : $[ + `abort : `abort, + `next : "overview", + ], + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** + * Whole configuration of lxc + * @return sequence result + */ +any LxcSequence() { + + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : `next + ], + ]; + + Wizard::CreateDialog(); + Wizard::HideAbortButton (); + Wizard::SetDesktopTitleAndIcon("lxc"); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + +/* EOF */ +} -- 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] r67976 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsZones.pm
by locilka＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: locilka Date: Fri Apr 20 16:20:05 2012 New Revision: 67976 URL: http://svn.opensuse.org/viewcvs/yast?rev=67976&view=rev Log: - Fixed removing RRs from LDAP when they share the same LDAP object with another non-deleted RRs (BNC#755592). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsZones.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Apr 20 16:20:05 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com + +- Fixed removing RRs from LDAP when they share the same LDAP + object with another non-deleted RRs (BNC#755592). + +------------------------------------------------------------------ Tue Apr 17 16:53:59 CEST 2012 - locilka(a)suse.com - Triggering the global "modified" flag while adding/modifying Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsZones.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsZones.pm Fri Apr 20 16:20:05 2012 @@ -33,6 +33,7 @@ my $zone_base_config_dn = ""; +my $LDAP_RECORD = 'Record'; YaST::YCP::Import ("SCR"); use DnsTsigKeys; @@ -470,6 +471,11 @@ # LDAP data +# @param string record type +sub LDAPRecordString { + return drunkCamelType (shift).$LDAP_RECORD; +} + BEGIN { $TYPEINFO{ZoneReadLdap} = ["function", [ "map", "any", "any" ], "string", "string" ]; } sub ZoneReadLdap { my $self = shift; @@ -506,7 +512,7 @@ my %zonemap = %{$found[0] || {}}; my $serial = $self->UpdateSerial (""); - my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W 1D"]}; + my @soa_str_lst = @{$zonemap{LDAPRecordString('SOA')}|| ["@ root $serial 3H 1H 1W 1D"]}; my $soa_str = $soa_str_lst[0]; my @soa_lst = split (" ", $soa_str); @@ -557,7 +563,7 @@ foreach my $rec_type (@all_rec_types) { - my $value_key = $rec_type."Record"; + my $value_key = $rec_type.$LDAP_RECORD; my @values = @{$record{$value_key} || []}; foreach my $value (@values) { @@ -574,6 +580,41 @@ return \%ret; } +sub FillUpTmpLDAPRecords { + my $ref_found = shift; + + my ($ldap_key, $record_key); + my $ldap_records = {}; + + foreach my $l_record (@{$$ref_found}) { + $ldap_key = $l_record->{'relativeDomainName'}[0]; + $ldap_records->{$ldap_key} = [] if not defined $ldap_records->{$ldap_key}; + foreach $record_key (keys %{$l_record}) { + push @{$ldap_records->{$ldap_key}}, $record_key if ($record_key =~ /^.*$LDAP_RECORD$/); + } + } + + return $ldap_records; +} + +sub MarkRemovedRecords { + my $ref_ldap_record = shift; + my $ref_relative_domain = shift; + my $ref_all_records = shift; + + # Record is currently in LDAP + if (defined $$ref_all_records->{$$ref_relative_domain}) { + # All record types in relative domain + foreach my $recordtype (@{$$ref_all_records->{$$ref_relative_domain}}) { + # The new record does not contain such record type (thus it's removed) + if (not defined $$ref_ldap_record{$recordtype}) { + $$ref_ldap_record{$recordtype} = []; + y2milestone ("Record ".$recordtype." has been removed from ".$$ref_relative_domain." object"); + } + } + } +} + BEGIN { $TYPEINFO{ZoneFileWriteLdap} = ["function", "boolean", [ "map", "any", "any"]];} sub ZoneFileWriteLdap { my $self = shift; @@ -611,16 +652,16 @@ "relativeDomainName" => ["@"], "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], "dNSClass" => ["IN"], - "sOARecord" => $soa_record, + LDAPRecordString('SOA') => $soa_record, ); my @current_records = grep { my %r = %{$_}; - $r{"key"} eq "@" || $r{"key"} eq $zone . "." + $r{"key"} eq "@" || $r{"key"} eq $zone."." } @records; foreach my $rec_ref (@current_records) { - my $type = lc ($rec_ref->{"type"}) . "record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; @@ -639,15 +680,24 @@ ); my $found_ref = SCR->Read (".ldap.search", \%ldap_query); + y2debug ("Base record: ".Dumper($found_ref)); + + my $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + + # Some (sub)records have been removed but the LDAP record have to stay + foreach my $r ('@', $zone.'.') { + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + } + y2debug ("New base record: ".Dumper(\%ldap_record)); if (scalar (@{$found_ref || []}) == 0) { - y2milestone ("Creating new record"); + y2milestone ("Creating new zone record"); SCR->Write (".ldap.add", \%ldap_cmd, \%ldap_record); } else { - y2milestone ("Modifying existing record"); + y2milestone ("Modifying existing zone record"); delete $ldap_record{"objectClass"}; # objectclass can be changed by mail-server SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record); } @@ -656,7 +706,9 @@ my %r = %{$_}; $r{"key"} } @records; + # Never delete the base entry push @all_records, "@"; + # the search config map %ldap_query = ( "base_dn" => $zone_dn, @@ -668,13 +720,16 @@ $found_ref = SCR->Read (".ldap.search", \%ldap_query) || []; my @found = @{$found_ref}; - @found = map { my @l = @{$_->{"relativeDomainName"}}; $l[0]; } @found; - #remove removed entries + $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + y2debug ("Records currently in LDAP: ".Dumper($ldap_records)); + y2debug ("New state of records: ".Dumper(\@records)); + + # Delete removed entries (only fully removed entries will be deleted) my @deleted = grep { my $current = $_; my @equiv = grep { @@ -716,12 +771,16 @@ } @records; foreach my $rec_ref (@current_records) { - my $type = drunkCamelType ($rec_ref->{"type"})."Record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; } + # Some (sub)records have been removed but the LDAP record have to stay + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + y2debug ("New record: ".Dumper(\%ldap_record)); + # the search config map - to choose add or modify my %ldap_query = ( "base_dn" => $rec_dn, -- 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] r67975 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsZones.pm
by locilka＠svn2.opensuse.org 20 Apr '12

20 Apr '12

Author: locilka Date: Fri Apr 20 16:19:54 2012 New Revision: 67975 URL: http://svn.opensuse.org/viewcvs/yast?rev=67975&view=rev Log: - Fixed removing RRs from LDAP when they share the same LDAP object with another non-deleted RRs (BNC#755592). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsZones.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Apr 20 16:19:54 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com + +- Fixed removing RRs from LDAP when they share the same LDAP + object with another non-deleted RRs (BNC#755592). + +------------------------------------------------------------------ Tue Apr 17 16:53:59 CEST 2012 - locilka(a)suse.com - Triggering the global "modified" flag while adding/modifying Modified: trunk/dns-server/src/DnsZones.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsZones.pm?rev=6… ============================================================================== --- trunk/dns-server/src/DnsZones.pm (original) +++ trunk/dns-server/src/DnsZones.pm Fri Apr 20 16:19:54 2012 @@ -33,6 +33,7 @@ my $zone_base_config_dn = ""; +my $LDAP_RECORD = 'Record'; YaST::YCP::Import ("SCR"); use DnsTsigKeys; @@ -470,6 +471,11 @@ # LDAP data +# @param string record type +sub LDAPRecordString { + return drunkCamelType (shift).$LDAP_RECORD; +} + BEGIN { $TYPEINFO{ZoneReadLdap} = ["function", [ "map", "any", "any" ], "string", "string" ]; } sub ZoneReadLdap { my $self = shift; @@ -506,7 +512,7 @@ my %zonemap = %{$found[0] || {}}; my $serial = $self->UpdateSerial (""); - my @soa_str_lst = @{$zonemap{"sOARecord"}|| ["@ root $serial 3H 1H 1W 1D"]}; + my @soa_str_lst = @{$zonemap{LDAPRecordString('SOA')}|| ["@ root $serial 3H 1H 1W 1D"]}; my $soa_str = $soa_str_lst[0]; my @soa_lst = split (" ", $soa_str); @@ -557,7 +563,7 @@ foreach my $rec_type (@all_rec_types) { - my $value_key = $rec_type."Record"; + my $value_key = $rec_type.$LDAP_RECORD; my @values = @{$record{$value_key} || []}; foreach my $value (@values) { @@ -574,6 +580,41 @@ return \%ret; } +sub FillUpTmpLDAPRecords { + my $ref_found = shift; + + my ($ldap_key, $record_key); + my $ldap_records = {}; + + foreach my $l_record (@{$$ref_found}) { + $ldap_key = $l_record->{'relativeDomainName'}[0]; + $ldap_records->{$ldap_key} = [] if not defined $ldap_records->{$ldap_key}; + foreach $record_key (keys %{$l_record}) { + push @{$ldap_records->{$ldap_key}}, $record_key if ($record_key =~ /^.*$LDAP_RECORD$/); + } + } + + return $ldap_records; +} + +sub MarkRemovedRecords { + my $ref_ldap_record = shift; + my $ref_relative_domain = shift; + my $ref_all_records = shift; + + # Record is currently in LDAP + if (defined $$ref_all_records->{$$ref_relative_domain}) { + # All record types in relative domain + foreach my $recordtype (@{$$ref_all_records->{$$ref_relative_domain}}) { + # The new record does not contain such record type (thus it's removed) + if (not defined $$ref_ldap_record{$recordtype}) { + $$ref_ldap_record{$recordtype} = []; + y2milestone ("Record ".$recordtype." has been removed from ".$$ref_relative_domain." object"); + } + } + } +} + BEGIN { $TYPEINFO{ZoneFileWriteLdap} = ["function", "boolean", [ "map", "any", "any"]];} sub ZoneFileWriteLdap { my $self = shift; @@ -611,16 +652,16 @@ "relativeDomainName" => ["@"], "dNSTTL" => [DnsRoutines->NormalizeTime ($zone_map{"ttl"} || "2D")], "dNSClass" => ["IN"], - "sOARecord" => $soa_record, + LDAPRecordString('SOA') => $soa_record, ); my @current_records = grep { my %r = %{$_}; - $r{"key"} eq "@" || $r{"key"} eq $zone . "." + $r{"key"} eq "@" || $r{"key"} eq $zone."." } @records; foreach my $rec_ref (@current_records) { - my $type = lc ($rec_ref->{"type"}) . "record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; @@ -639,15 +680,24 @@ ); my $found_ref = SCR->Read (".ldap.search", \%ldap_query); + y2debug ("Base record: ".Dumper($found_ref)); + + my $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + + # Some (sub)records have been removed but the LDAP record have to stay + foreach my $r ('@', $zone.'.') { + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + } + y2debug ("New base record: ".Dumper(\%ldap_record)); if (scalar (@{$found_ref || []}) == 0) { - y2milestone ("Creating new record"); + y2milestone ("Creating new zone record"); SCR->Write (".ldap.add", \%ldap_cmd, \%ldap_record); } else { - y2milestone ("Modifying existing record"); + y2milestone ("Modifying existing zone record"); delete $ldap_record{"objectClass"}; # objectclass can be changed by mail-server SCR->Write (".ldap.modify", \%ldap_cmd, \%ldap_record); } @@ -656,7 +706,9 @@ my %r = %{$_}; $r{"key"} } @records; + # Never delete the base entry push @all_records, "@"; + # the search config map %ldap_query = ( "base_dn" => $zone_dn, @@ -668,13 +720,16 @@ $found_ref = SCR->Read (".ldap.search", \%ldap_query) || []; my @found = @{$found_ref}; - @found = map { my @l = @{$_->{"relativeDomainName"}}; $l[0]; } @found; - #remove removed entries + $ldap_records = FillUpTmpLDAPRecords(\$found_ref); + y2debug ("Records currently in LDAP: ".Dumper($ldap_records)); + y2debug ("New state of records: ".Dumper(\@records)); + + # Delete removed entries (only fully removed entries will be deleted) my @deleted = grep { my $current = $_; my @equiv = grep { @@ -716,12 +771,16 @@ } @records; foreach my $rec_ref (@current_records) { - my $type = drunkCamelType ($rec_ref->{"type"})."Record"; + my $type = LDAPRecordString($rec_ref->{"type"}); my @cur_vals = @{$ldap_record{$type} || []}; push @cur_vals, $rec_ref->{"value"}; $ldap_record{$type} = \@cur_vals; } + # Some (sub)records have been removed but the LDAP record have to stay + MarkRemovedRecords (\%ldap_record, \$r, \$ldap_records); + y2debug ("New record: ".Dumper(\%ldap_record)); + # the search config map - to choose add or modify my %ldap_query = ( "base_dn" => $rec_dn, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0