April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68004 - in /trunk/network: package/yast2-network.changes src/clients/lan_auto.ycp src/config/networking.rnc src/modules/Lan.ycp
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 13:35:45 2012 New Revision: 68004 URL: http://svn.opensuse.org/viewcvs/yast?rev=68004&view=rev Log: fixed rnc file Modified: trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/config/networking.rnc trunk/network/src/modules/Lan.ycp 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 Apr 24 13:35:45 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 24 13:35:28 CEST 2012 - ug(a)suse.de + +- keep_install_network added to rnc file + +------------------------------------------------------------------- Wed Apr 11 11:13:51 CEST 2012 - mvidner(a)suse.cz - Fixed a dead reference to proxy code; moved a forgotten file. 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 Tue Apr 24 13:35:45 2012 @@ -257,6 +257,7 @@ ret["managed"] = settings["managed"]:false; if(haskey(settings, "ipv6")) ret["ipv6"] = settings["ipv6"]:true; + ret["keep_install_network"] = settings["keep_install_network"]:false; if (size(modules) > 0 ) ret["modules"] = modules; if (size(dns) > 0 ) 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 Tue Apr 24 13:35:45 2012 @@ -6,6 +6,7 @@ networking = element networking { element start_immediately { BOOLEAN }? & + element keep_install_network { BOOLEAN }? & ipv6? & managed? & strict_IP_check_timeout? & Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue Apr 24 13:35:45 2012 @@ -614,6 +614,7 @@ LanItems::autoinstall_settings["start_immediately"] = settings["start_immediately"]:false; LanItems::autoinstall_settings["strict_IP_check_timeout"] = settings["strict_IP_check_timeout"]:-1; + LanItems::autoinstall_settings["keep_install_network"] = settings["keep_install_network"]:false; NetworkConfig::Import(settings["config"]:$[]); DNS::Import((map) eval(settings["dns"]:$[])); @@ -643,6 +644,7 @@ "routing" : Routing::Export(), "managed" : NetworkService::IsManaged (), "start_immediately": LanItems::autoinstall_settings["start_immediately"]:false, //start_immediately, + "keep_install_network": LanItems::autoinstall_settings["keep_install_network"]:false, ]; y2milestone("Exported map: %1", ay); return ay; -- 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] r68003 - in /trunk/firstboot: package/yast2-firstboot.changes src/data/Makefile.am src/data/firstboot.rnc yast2-firstboot.spec.in
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 13:19:56 2012 New Revision: 68003 URL: http://svn.opensuse.org/viewcvs/yast?rev=68003&view=rev Log: added autoyast schema file Added: trunk/firstboot/src/data/firstboot.rnc Modified: trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/data/Makefile.am trunk/firstboot/yast2-firstboot.spec.in Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Tue Apr 24 13:19:56 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 24 13:15:18 CEST 2012 - ug(a)suse.de + +- added schema check file for autoyast + +------------------------------------------------------------------- Thu Mar 29 14:47:01 CEST 2012 - jsuchome(a)suse.cz - merged proofed texts Modified: trunk/firstboot/src/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/Makefile.am?r… ============================================================================== --- trunk/firstboot/src/data/Makefile.am (original) +++ trunk/firstboot/src/data/Makefile.am Tue Apr 24 13:19:56 2012 @@ -7,6 +7,9 @@ modconfigdir = $(prefix)/share/autoinstall/modules modconfig_DATA = firstboot.desktop -EXTRA_DIST = $(fillup_DATA) $(modconfig_DATA) +schemafilesdir = $(schemadir)/autoyast/rnc +schemafiles_DATA = $(wildcard *.rnc) + +EXTRA_DIST = $(fillup_DATA) $(modconfig_DATA) $(schemafiles_DATA) include $(top_srcdir)/Makefile.am.common Added: trunk/firstboot/src/data/firstboot.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/data/firstboot.rnc… ============================================================================== --- trunk/firstboot/src/data/firstboot.rnc (added) +++ trunk/firstboot/src/data/firstboot.rnc Tue Apr 24 13:19:56 2012 @@ -0,0 +1,8 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +firstboot = element firstboot { + element firstboot_enabled { BOOLEAN }? +} + Modified: trunk/firstboot/yast2-firstboot.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.i… ============================================================================== --- trunk/firstboot/yast2-firstboot.spec.in (original) +++ trunk/firstboot/yast2-firstboot.spec.in Tue Apr 24 13:19:56 2012 @@ -65,3 +65,4 @@ %doc COPYING /etc/YaST2/*.xml /usr/share/autoinstall/modules/firstboot.desktop +/usr/share/YaST2/schema/autoyast/rnc/firstboot.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] r68002 - in /trunk/autoinstallation: package/autoyast2.changes src/schema/scripts.rnc
by ug＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: ug Date: Tue Apr 24 13:04:42 2012 New Revision: 68002 URL: http://svn.opensuse.org/viewcvs/yast?rev=68002&view=rev Log: added postpartitioning-scripts to rnc file Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/schema/scripts.rnc Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Apr 24 13:04:42 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 13:04:03 CEST 2012 - ug(a)suse.de + +- added postpartitioning-scripts to rnc file + (bnc#752896) + +------------------------------------------------------------------- Mon Apr 16 16:55:42 CEST 2012 - ug(a)suse.de - setting disklabel to gpt did not work (bnc#757324) Modified: trunk/autoinstallation/src/schema/scripts.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/scri… ============================================================================== --- trunk/autoinstallation/src/schema/scripts.rnc (original) +++ trunk/autoinstallation/src/schema/scripts.rnc Tue Apr 24 13:04:42 2012 @@ -7,7 +7,8 @@ chroot-scripts? & post-scripts? & pre-scripts? & - init-scripts? + init-scripts? & + postpartitioning-scripts? } chroot-scripts = @@ -30,6 +31,12 @@ LIST, autoinstall-init-script+ } +postpartitioning-scripts = +element postpartitioning-scripts { + LIST, + autoinstall-script+ +} + # script is overloaded autoinstall-script = element script { -- 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] r68001 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: locilka Date: Tue Apr 24 10:43:58 2012 New Revision: 68001 URL: http://svn.opensuse.org/viewcvs/yast?rev=68001&view=rev Log: - Fixed redrawing records settings UI entries when deleting records (BNC#758745). - 2.23.2 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=68001&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Tue Apr 24 10:43:58 2012 @@ -1 +1 @@ -2.23.1 +2.23.2 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 Tue Apr 24 10:43:58 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Tue Apr 24 10:38:54 CEST 2012 - locilka(a)suse.com + +- Fixed redrawing records settings UI entries when deleting + records (BNC#758745). +- 2.23.2 + +------------------------------------------------------------------ Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com - Fixed removing RRs from LDAP when they share the same LDAP Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Tue Apr 24 10:43:58 2012 @@ -1196,6 +1196,8 @@ ); } +void SwitchAndAdjustEditationWidgets (string & type, map current_record, string & decoded_zone, string & zone); + void RedrawZonesTable () { integer index = -1; string zone_name = current_zone["zone"]:""; @@ -1270,10 +1272,12 @@ if (size (items) > 0) { - r = (integer) - UI::QueryWidget (`id ("records_list"), `CurrentItem); + r = (integer) UI::QueryWidget (`id ("records_list"), `CurrentItem); + + map current_record = current_zone["records", r]:$[]; + string current_type = current_record["type"]:"A"; - AdjustEditationWidgets (current_zone["records", r]:$[], decoded_zone_name, zone_name); + SwitchAndAdjustEditationWidgets (current_type, current_record, decoded_zone_name, zone_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] r68000 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: VERSION package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: locilka Date: Tue Apr 24 10:43:32 2012 New Revision: 68000 URL: http://svn.opensuse.org/viewcvs/yast?rev=68000&view=rev Log: - Fixed redrawing records settings UI entries when deleting records (BNC#758745). - 2.17.14.3 Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION Tue Apr 24 10:43:32 2012 @@ -1 +1 @@ -2.17.14.2 +2.17.14.3 Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Tue Apr 24 10:43:32 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Tue Apr 24 10:38:54 CEST 2012 - locilka(a)suse.com + +- Fixed redrawing records settings UI entries when deleting + records (BNC#758745). +- 2.17.14.3 + +------------------------------------------------------------------ Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com - Fixed removing RRs from LDAP when they share the same LDAP Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Tue Apr 24 10:43:32 2012 @@ -1196,6 +1196,8 @@ ); } +void SwitchAndAdjustEditationWidgets (string & type, map current_record, string & decoded_zone, string & zone); + void RedrawZonesTable () { integer index = -1; string zone_name = current_zone["zone"]:""; @@ -1270,10 +1272,12 @@ if (size (items) > 0) { - r = (integer) - UI::QueryWidget (`id ("records_list"), `CurrentItem); + r = (integer) UI::QueryWidget (`id ("records_list"), `CurrentItem); + + map current_record = current_zone["records", r]:$[]; + string current_type = current_record["type"]:"A"; - AdjustEditationWidgets (current_zone["records", r]:$[], decoded_zone_name, zone_name); + SwitchAndAdjustEditationWidgets (current_type, current_record, decoded_zone_name, zone_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] r67999 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: VERSION package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 24 Apr '12

24 Apr '12

Author: locilka Date: Tue Apr 24 10:43:10 2012 New Revision: 67999 URL: http://svn.opensuse.org/viewcvs/yast?rev=67999&view=rev Log: - Fixed redrawing records settings UI entries when deleting records (BNC#758745). - 2.17.20 Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION Tue Apr 24 10:43:10 2012 @@ -1 +1 @@ -2.17.19 +2.17.20 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 Tue Apr 24 10:43:10 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Tue Apr 24 10:38:54 CEST 2012 - locilka(a)suse.com + +- Fixed redrawing records settings UI entries when deleting + records (BNC#758745). +- 2.17.20 + +------------------------------------------------------------------ Fri Apr 20 16:16:11 CEST 2012 - locilka(a)suse.com - Fixed removing RRs from LDAP when they share the same LDAP Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Tue Apr 24 10:43:10 2012 @@ -1196,6 +1196,8 @@ ); } +void SwitchAndAdjustEditationWidgets (string & type, map current_record, string & decoded_zone, string & zone); + void RedrawZonesTable () { integer index = -1; string zone_name = current_zone["zone"]:""; @@ -1270,10 +1272,12 @@ if (size (items) > 0) { - r = (integer) - UI::QueryWidget (`id ("records_list"), `CurrentItem); + r = (integer) UI::QueryWidget (`id ("records_list"), `CurrentItem); + + map current_record = current_zone["records", r]:$[]; + string current_type = current_record["type"]:"A"; - AdjustEditationWidgets (current_zone["records", r]:$[], decoded_zone_name, zone_name); + SwitchAndAdjustEditationWidgets (current_type, current_record, decoded_zone_name, zone_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] r67998 - /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 16:48:30 2012 New Revision: 67998 URL: http://svn.opensuse.org/viewcvs/yast?rev=67998&view=rev Log: whitespace 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 16:48:30 2012 @@ -46,51 +46,50 @@ boolean CreateContainerConfig (string name, string ip, string subnet, string bridge, string template) { - // busy message - Popup::ShowFeedback ("", _("Creating Configuration...")); + // 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: + // 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 false; + } return true; } -- 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] r67997 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: jsuchome Date: Mon Apr 23 16:46:35 2012 New Revision: 67997 URL: http://svn.opensuse.org/viewcvs/yast?rev=67997&view=rev Log: - handle more consoles running - check console processes state - properly handle buttons enablement - report error on start failure - stop container before deleting - enable manual refreshing of the table - 2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/V… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/VERSION Mon Apr 23 16:46:35 2012 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/p… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/package/yast2-lxc.changes Mon Apr 23 16:46:35 2012 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Mon Apr 23 16:42:59 CEST 2012 - jsuchome(a)suse.cz + +- handle more consoles running +- check console processes state +- properly handle buttons enablement +- report error on start failure +- stop container before deleting +- enable manual refreshing of the table +- 2.17.3 + +------------------------------------------------------------------- Mon Apr 23 11:54:12 CEST 2012 - jsuchome(a)suse.cz - show list of containers 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 16:46:35 2012 @@ -40,6 +40,9 @@ import "Security"; import "Wizard"; +// PIDs of running consoles (indexed by lxc names) +map<string,integer> console_pids = $[]; + boolean CreateContainerConfig (string name, string ip, string subnet, string bridge, string template) { @@ -92,7 +95,7 @@ } /** - * Adding new Linux Container + * Dialog for adding new Linux Container * @return dialog result */ any AddDialog () { @@ -163,7 +166,7 @@ UI::ChangeWidget (`id (`ip), `ValidChars, IP::ValidChars4); any ret = nil; - while(true) { + while (true) { ret = UI::UserInput(); @@ -291,34 +294,57 @@ } -void StartContainer (string name) +/** + * Start selected container + */ +boolean StartContainer (string name) { - // start container as a deamon, so it survives YaST's exit - string cmd = sformat ("lxc-start -d -n %1", name); + // start container as a deamon, so it survives YaST's exit + string cmd = sformat ("lxc-start -d -n %1", name); - 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. + map out = (map) SCR::Execute (.target.bash_output, cmd); + + if (out["exit"]:0 != 0) + { + Report::Error (sformat (_("Error while starting container: + +%1"), out["stdout"]:"" + out["stderr"]:"")); + return false; + } + if (Lxc::textmode) + { + // message, %1 is a name + Popup::Message (sformat (_("The Container '%1' was started in the background. Use 'lxc-console' command to connect to the running Container."), name)); - } + } + return true; } +/** + * Stop given container + */ void StopContainer (string name) { y2internal ("lxc-stop: %1", SCR::Execute (.target.bash_output, "lxc-stop -n " + name) ); + if (console_pids[name]:nil != nil) + { + // close the console if stopping + SCR::Execute (.process.kill, console_pids[name]:nil, 15); + } } +/** + * Delete given container + */ void DestroyContainer (string name) { // busy message Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", name)); - string cmd = "lxc-destroy -f -n " + name; + string cmd = "lxc-destroy -n " + name; +// string cmd = "lxc-destroy -f -n " + name; map out = (map) SCR::Execute (.target.bash_output, cmd); y2internal ("out: %1", out); @@ -334,7 +360,10 @@ } } -// Launch console for selected container +/** + * Launch console for selected container + * Return PID of console process + */ integer Connect (string name) { string cmd = sformat ("xterm -e lxc-console -n %1", name); @@ -352,23 +381,73 @@ // LXC overview dialog caption string caption = _("LXC Configuration"); - integer console_pid = -1; - list<term> lxc_list = []; + // current container + string selected = ""; + + // update status of the buttons according to current item + void update_buttons (string selected) { + + if (selected == nil || selected == "") + { + return; + } + + term line = (term) UI::QueryWidget (`id (`table), `Item (selected)); + boolean running = line[2]:"" == "RUNNING"; // TODO do some better test + UI::ChangeWidget (`id (`start), `Enabled, !running); + UI::ChangeWidget (`id (`stop), `Enabled, running); + if (Lxc::textmode) + { + return; + } + if (console_pids[selected]:nil == nil) + { + UI::ReplaceWidget (`id (`rp_console), + // button label + `PushButton (`id (`connect), _("Connect")) + ); + UI::ChangeWidget (`id (`connect), `Enabled, running); + } + else + { + UI::ReplaceWidget (`id (`rp_console), + // button label + `PushButton (`id (`disconnect), _("Disconnect")) + ); + } + } + + // update table with fresh items void update_table () { - lxc_list = Lxc::GetContainers ();; + list<term> 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); - }); - // FIXME allow Connect only for running + if (size (lxc_list) == 0) + { + foreach (any t, [ `table, `destroy, `start, `stop, `connect ], { + UI::ChangeWidget (`id (t), `Enabled, false); + }); + } + else + { + UI::SetFocus (`id (`table)); + if (selected != "") + { + UI::ChangeWidget (`id (`table), `CurrentItem, selected); + } + selected = (string) UI::QueryWidget (`id (`table), `CurrentItem); + update_buttons (selected); + } } term contents = `HBox (`HSpacing (), `VBox ( `VSpacing (), + // button label + `Right (`PushButton (`id (`refresh), _("Refresh"))), // Table header - `Table (`id (`table), `opt (`notify), `header(_("Name"), _("Status")), lxc_list), + `Table (`id (`table), `opt (`notify, `immediate), `header(_("Name"), _("Status")), []), `HBox ( `PushButton (`id (`add_button), `opt (`key_F3), Label::CreateButton ()), // button label @@ -386,17 +465,25 @@ `VSpacing () ), `HSpacing ()); - // FIXME add Refresh Table button - Wizard::SetContentsButtons(caption, contents, "overview", Label::BackButton(), Label::FinishButton()); update_table (); any ret = nil; - while(true) { - ret = UI::UserInput(); + while (true) { + + // polling only if there's some process to watch + if (size (console_pids) > 0) + { + sleep (100); + ret = UI::PollInput(); + } + else + { + ret = UI::UserInput(); + } if (ret == `abort || ret == `cancel || ret == `next || ret == `back) { break; @@ -406,47 +493,52 @@ ret = `add; break; } - string selected = (string) UI::QueryWidget (`id (`table), `CurrentItem); + selected = (string) UI::QueryWidget (`id (`table), `CurrentItem); + integer console_pid = console_pids[selected]:nil; + + // check the status of console process + if (console_pid != nil && SCR::Read (.process.running, console_pid) != true) { + y2milestone ("console process is dead"); + console_pids = remove (console_pids, selected); + update_buttons (selected); + continue; + } + + if (ret == `table) { + update_buttons (selected); + } + + if (ret == `refresh) { + update_table (); + } if (ret == `start) { StartContainer (selected); update_table (); - continue; } - if (ret == `connect) { - // FIXME solve more consoles running - // FIXME check if console was closed from outside - console_pid = Connect (selected); - UI::ReplaceWidget (`id (`rp_console), - // button label - `PushButton (`id (`disconnect), _("Disconnect")) - ); - continue; + if (ret == `connect && console_pid == nil) { + console_pids[selected] = Connect (selected); + update_buttons (selected); } - if (ret == `disconnect && console_pid != -1) { + if (ret == `disconnect && console_pid != nil) { + y2milestone ("killing console proces with PID %1...", console_pid); 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; + console_pids = remove (console_pids, selected); + update_buttons (selected); } if (ret == `stop) { StopContainer (selected); update_table (); - continue; } - if (ret == `destroy) { - // FIXME ask for confirmation + if (ret == `destroy && Popup::YesNo (sformat (_("Are you sure to delete container '%1'?"), selected))) { + StopContainer (selected); DestroyContainer (selected); 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] r67996 - /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 15:17:53 2012 New Revision: 67996 URL: http://svn.opensuse.org/viewcvs/yast?rev=67996&view=rev Log: update the list of bridges 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 15:17:53 2012 @@ -109,6 +109,7 @@ `HSpacing (0.5), // text entry `Left (`TextEntry (`id (`name), _("Name"))), + `HSpacing (), // combo box label `ComboBox (`id (`template), _("Template"), template_items) )), @@ -119,8 +120,10 @@ `HBox ( // text entry label `TextEntry (`id (`ip), _("IP Address")), + `HSpacing (), // text entry label `TextEntry (`id (`subnet), _("Subnet"), "/24"), + `HSpacing (), `ReplacePoint (`id (`rp_lan), // combo box label `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) @@ -170,14 +173,11 @@ if (ret == `lan) { - any lan_ret = WFM::CallFunction ("lan"); - if (lan_ret == `next || lan_ret == `finish) - { - UI::ReplaceWidget (`id (`rp_lan), + WFM::CallFunction ("lan"); + UI::ReplaceWidget (`id (`rp_lan), // combo box label `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) - ); - } + ); 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] r67995 - /branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 23 Apr '12

23 Apr '12

Author: gs Date: Mon Apr 23 13:34:47 2012 New Revision: 67995 URL: http://svn.opensuse.org/viewcvs/yast?rev=67995&view=rev Log: add bug # Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/package/yast2-ncurses.changes Mon Apr 23 13:34:47 2012 @@ -2,7 +2,7 @@ Thu Mar 8 11:18:13 CET 2012 - gs(a)suse.de - NCRichText: interpret html tags inside <pre> (bnc #724119), - show license text correctly (bnc #737752) + don't display html tags (bnc #737752, bnc #758230) ------------------------------------------------------------------- Thu Jun 16 12:34:46 CEST 2011 - gs(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0