April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r68054 - in /trunk/ruby-bindings: src/ruby/Y2RubyTypeConv.cc tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jreidinger Date: Mon Apr 30 16:48:01 2012 New Revision: 68054 URL: http://svn.opensuse.org/viewcvs/yast?rev=68054&view=rev Log: optimalize and simplify hash to map conversion ( use to_a method and fast pointer aritmetic ) Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Apr 30 16:48:01 2012 @@ -66,13 +66,12 @@ static YCPMap rbhash_2_ycpmap( VALUE value ) { YCPMap map; - VALUE keys = rb_funcall(value, rb_intern("keys"), 0); - int n = NUM2LONG(rb_funcall(keys, rb_intern("size"), 0)); - for ( int i=0; i<n; ++i) + VALUE list = rb_funcall(value, rb_intern("to_a"), 0); //get array of two items array, first is key and second is value + for ( unsigned i=0; i<RARRAY_LEN(list); ++i) { - VALUE rkey = rb_funcall(keys, rb_intern("at"), 1, INT2NUM(i)); - YCPValue ykey = rbvalue_2_ycpvalue(rkey); - YCPValue yvalue = rbvalue_2_ycpvalue( rb_funcall(value, rb_intern("[]"), 1, rkey) ); + VALUE kv_list = *(RARRAY_PTR(list)+i); + YCPValue ykey = rbvalue_2_ycpvalue(*RARRAY_PTR(kv_list)); + YCPValue yvalue = rbvalue_2_ycpvalue(*(RARRAY_PTR(kv_list)+1)); map.add(ykey, yvalue); } return map; Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Mon Apr 30 16:48:01 2012 @@ -17,7 +17,8 @@ return false; } map h = tomap(InRuby::get_hash()); - if ( tostring(h["a"]:"") != "b") + y2milestone("get hash: %1",h); + if ( tostring(h["a"]:"") != "b" || tostring(h["b"]:"") != "c" ) { y2error("map is not properly returned: %1",result); return false; -- 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] r68053 - in /trunk/ruby-bindings/tests/ycp: InRuby.rb ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jreidinger Date: Mon Apr 30 15:55:12 2012 New Revision: 68053 URL: http://svn.opensuse.org/viewcvs/yast?rev=68053&view=rev Log: add test for map conversion ( preparation for refactoring) Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/InRuby.r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/InRuby.rb (original) +++ trunk/ruby-bindings/tests/ycp/InRuby.rb Mon Apr 30 15:55:12 2012 @@ -6,4 +6,8 @@ def self.raising_code raise "Wow exception!" end + + def self.get_hash + return { "a" => "b", "b" => "c" } + end end Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Mon Apr 30 15:55:12 2012 @@ -16,7 +16,14 @@ y2error("exception completely ignored result: %1",result); return false; } + map h = tomap(InRuby::get_hash()); + if ( tostring(h["a"]:"") != "b") + { + y2error("map is not properly returned: %1",result); + return false; + } import "CamelCase"; result = tostring(CamelCase::inc(10)); y2milestone("result: %1", result); + 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] r68052 - /trunk/ruby-bindings/src/ruby/YRubyNamespace.cc
by jreidinger＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jreidinger Date: Mon Apr 30 15:04:51 2012 New Revision: 68052 URL: http://svn.opensuse.org/viewcvs/yast?rev=68052&view=rev Log: simplify creating signature for yc[ Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRubyName… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRubyNamespace.cc (original) +++ trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Mon Apr 30 15:04:51 2012 @@ -37,17 +37,6 @@ #include "Y2RubyUtils.h" /** - * using this instead of plain strcmp - * enables embedding argument names into the typeinfo - */ -static bool firstWordIs (const char *where, const char *what) -{ - size_t n = strlen (what); - return !strncmp (where, what, n) && - (where[n] == '\0' || isspace (where[n])); -} - -/** * The definition of a function that is implemented in Ruby */ class Y2RubyFunctionCall : public Y2Function @@ -207,38 +196,26 @@ VALUE current = RARRAY(methods)->ptr[i]; y2milestone("New method: '%s'", RSTRING(current)->ptr); - constTypePtr sym_tp = Type::Unspec; - //sym_tp = parseTypeinfo (*sym_ti) - if (sym_tp->isError ()) + // figure out arity. + Check_Type(module,T_MODULE); + VALUE methodobj = rb_funcall( module, rb_intern("method"), 1, current ); + if ( methodobj == Qnil ) { - y2error ("Cannot parse $TYPEINFO{%s}", RSTRING(current)->ptr); + y2error ("Cannot access method object '%s'", RSTRING(current)->ptr); continue; } - if (sym_tp->isUnspec ()) + string signature = "any( "; + VALUE rbarity = rb_funcall( methodobj, rb_intern("arity"), 0); + int arity = NUM2INT(rbarity); + for ( int k=0; k < arity; ++k ) { - //sym_tp = new FunctionType (Type::Any, new FunctionType(Type::Any) ); - // figure out arity. - Check_Type(module,T_MODULE); - VALUE methodobj = rb_funcall( module, rb_intern("method"), 1, current ); - //VALUE methodobj = rb_funcall( module, rb_intern("send"), 2, rb_str_new2("method"), current ); - if ( methodobj == Qnil ) - { - y2error ("Cannot access method object '%s'", RSTRING(current)->ptr); - continue; - } - string signature = "any( "; - VALUE rbarity = rb_funcall( methodobj, rb_intern("arity"), 0); - int arity = NUM2INT(rbarity); - for ( int k=0; k < arity; ++k ) - { - signature += "any"; - if ( k < (arity - 1) ) - signature += ","; - } - signature += ")"; - y2internal("going to parse signature: '%s'", signature.c_str()); - sym_tp = Type::fromSignature(signature); + signature += "any"; + if ( k < (arity - 1) ) + signature += ","; } + signature += ")"; + y2internal("going to parse signature: '%s'", signature.c_str()); + constTypePtr sym_tp = Type::fromSignature(signature); constFunctionTypePtr fun_tp = (constFunctionTypePtr) sym_tp; -- 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] r68051 - in /trunk/ruby-bindings: src/ruby/YRuby.cc tests/ycp/run_ycp_test.sh
by jreidinger＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jreidinger Date: Mon Apr 30 14:20:45 2012 New Revision: 68051 URL: http://svn.opensuse.org/viewcvs/yast?rev=68051&view=rev Log: cleaning up ruby bindings Modified: trunk/ruby-bindings/src/ruby/YRuby.cc trunk/ruby-bindings/tests/ycp/run_ycp_test.sh Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Apr 30 14:20:45 2012 @@ -67,30 +67,12 @@ rb_funcall(module, rb_intern("eval"), 1, rb_str_new2(code.c_str())); } -static void prependModulePath() -{ - YCPPathSearch::initialize (); - - list<string>::const_iterator - b = YCPPathSearch::searchListBegin (YCPPathSearch::Module), - e = YCPPathSearch::searchListEnd (YCPPathSearch::Module), - i; - - // count the number of directories to prepend -// int n = 0; -// for (i = b; i != e; ++i) -// { -// // do something -// } -} - YRuby * YRuby::_yRuby = 0; YRuby::YRuby() { y2milestone( "Initializing ruby interpreter." ); ruby_init(); - //ruby_options(argc - 1, ++argv); ruby_script("yast"); ruby_init_loadpath(); @@ -102,13 +84,13 @@ { refcount_map_t * vrby = (refcount_map_t *) object; - y2internal("mark: map size is %u", vrby->size()); + y2milestone("mark: map size is %u", vrby->size()); refcount_map_t::iterator b = vrby->begin(), e = vrby->end(), it; for (it = b; it != e; ++it) { - y2internal("marking: value %ld refcount %d", it->first, it->second); + y2milestone("marking: value %ld refcount %d", it->first, it->second); rb_gc_mark(it->first); } } @@ -117,7 +99,7 @@ { refcount_map_t * vrby = (refcount_map_t *) object; - y2internal("free: map size is %u", vrby->size()); + y2milestone("free: map size is %u", vrby->size()); y2internal("should happen quite last or we are in trouble FIXME"); } @@ -142,9 +124,10 @@ YRuby::destroy() { if ( _yRuby ) + { delete _yRuby; - - _yRuby = 0; + _yRuby = 0; + } return YCPVoid(); } @@ -156,48 +139,15 @@ YRuby::loadModule( YCPList argList ) { YRuby::yRuby(); - //y2milestone("loadModule 1"); if ( argList->size() != 2 || ! argList->value(0)->isString() || ! argList->value(1)->isString() ) return YCPError( "Ruby::loadModule() / Ruby::Use() : Bad arguments: String expected!" ); - //y2milestone("loadModule 2"); - string module_name = argList->value(0)->asString()->value(); string module_path = argList->value(1)->asString()->value(); - //y2milestone("loadModule 3: '%s'", module_name.c_str()); VALUE result = rb_require(module_path.c_str()); if ( result == Qfalse ) return YCPError( "Ruby::loadModule() / Can't load ruby module '" + module_path + "'" ); - //y2milestone("loadModule 4"); return YCPVoid(); } - -// snprintf into a temp string -static char * -fmtstr(const char* fmt, ...) -{ - va_list ap; - int len; - char* str; - - va_start(ap, fmt); - len = vsnprintf(NULL, 0, fmt, ap); - va_end(ap); - if (len <= 0) - { - return NULL; - } - str = (char*)malloc(len+1); - if (str == NULL) - { - return NULL; - } - va_start(ap, fmt); - vsnprintf(str, len+1, fmt, ap); - va_end(ap); - return str; -} - - // rb_protect-enabled rb_funcall, see below static VALUE protected_call(VALUE args) @@ -250,10 +200,7 @@ VALUE reason = rb_funcall(exception, rb_intern("message"), 0 ); VALUE trace = rb_gv_get("$@"); /* get last exception trace */ VALUE backtrace = rb_funcall(trace, rb_intern("join"), 1, rb_str_new("\n\t", 2)); - - char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); - y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); - free(tmp); + y2error("%s.%s failed\n%s\n\t%s", module_name.c_str(), function.c_str(), StringValuePtr(reason),StringValuePtr(backtrace)); //workaround if last_exception failed, then return always string with message if(function == "last_exception") //TODO constantify last_exception { @@ -264,7 +211,6 @@ } else { - //VALUE result = rb_funcall( module, rb_intern(function.c_str()), 2, INT2NUM(2), INT2NUM(3) ); y2milestone( "Called function '%s' in module '%s'", function.c_str(), module_name.c_str()); } return rbvalue_2_ycpvalue(result); Modified: trunk/ruby-bindings/tests/ycp/run_ycp_test.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/run_ycp_… ============================================================================== --- trunk/ruby-bindings/tests/ycp/run_ycp_test.sh (original) +++ trunk/ruby-bindings/tests/ycp/run_ycp_test.sh Mon Apr 30 14:20:45 2012 @@ -1,5 +1,10 @@ #!/bin/sh # $1 is the test case +if [ -z "$1" ]; then + echo "Missing file to run" >&2 + echo "Usage: run_ycp_test.sh <test file>" >&2 + exit 1 +fi DIR=${1%/*} # RPM_BUILD_ROOT will hold the YCP Ruby plugin at rpm build time if [ -d $RPM_BUILD_ROOT/usr/lib64 ]; then #we are on 64bit -- 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] r68050 - in /trunk/lxc: VERSION package/yast2-lxc.changes src/Lxc.ycp src/dialogs.ycp src/helps.ycp src/wizards.ycp
by jsuchome＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jsuchome Date: Mon Apr 30 13:53:28 2012 New Revision: 68050 URL: http://svn.opensuse.org/viewcvs/yast?rev=68050&view=rev Log: - updated help texts - cleaned debugging code, added comments - 2.22.1 Modified: trunk/lxc/VERSION trunk/lxc/package/yast2-lxc.changes trunk/lxc/src/Lxc.ycp trunk/lxc/src/dialogs.ycp trunk/lxc/src/helps.ycp trunk/lxc/src/wizards.ycp Modified: trunk/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/VERSION?rev=68050&r1=68049&r… ============================================================================== --- trunk/lxc/VERSION (original) +++ trunk/lxc/VERSION Mon Apr 30 13:53:28 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/package/yast2-lxc.changes?re… ============================================================================== --- trunk/lxc/package/yast2-lxc.changes (original) +++ trunk/lxc/package/yast2-lxc.changes Mon Apr 30 13:53:28 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 30 13:47:47 CEST 2012 - jsuchome(a)suse.cz + +- updated help texts +- cleaned debugging code, added comments +- 2.22.1 + +------------------------------------------------------------------- Fri Apr 27 14:48:38 CEST 2012 - jsuchome(a)suse.cz - openSUSE version Modified: trunk/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/Lxc.ycp?rev=68050&r1=680… ============================================================================== --- trunk/lxc/src/Lxc.ycp (original) +++ trunk/lxc/src/Lxc.ycp Mon Apr 30 13:53:28 2012 @@ -36,6 +36,7 @@ textdomain "lxc"; import "Directory"; +import "FileUtils"; import "Progress"; import "Security"; @@ -65,7 +66,9 @@ return ret; } -// encrypt given password using current method +/** + * Encrypt given password using current method + */ global string CryptPassword (string pw) { if (method == "md5") @@ -79,34 +82,40 @@ return crypt (pw); } +/** + * Read list of available bridges + */ global list<string> ReadBridgesIds () { - map out = (map) SCR::Execute (.target.bash_output, "brctl show | tail -n +2 | cut -f 1"); list<string> ret = []; - - if (out["stdout"]:"" != "") + if (FileUtils::Exists ("/sbin/brctl")) { - ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + map out = (map) SCR::Execute (.target.bash_output, "/sbin/brctl show | tail -n +2 | cut -f 1"); + + if (out["stdout"]:"" != "") + { + ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + } } return ret; } -global list<term> GetContainers () { +/** + * Read list of containers and their states + */ +global map<string,boolean> GetContainers () { - list<term> ret = []; - map lxc_index = $[]; + map<string,boolean> ret = $[]; map out = (map) SCR::Execute (.target.bash_output, "lxc-ls -1"); foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { - if (line != "" && !haskey (lxc_index, line)) + if (line != "" && !haskey (ret, 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; + ret[line] = state[1]:"" == "RUNNING"; } }); return ret; @@ -118,14 +127,13 @@ boolean CheckLXCConfiguration () { boolean problem = false; - // zgrep does not seem to work with .target.bash_output -> grep uncompressed config FIXME + // zgrep does not seem to work with .target.bash_output -> grep uncompressed config string tmpdir = Directory::tmpdir; SCR::Execute (.target.bash_output, sformat ( "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); map out = (map) SCR::Execute (.target.bash_output, sformat ( -// "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); - "GREP=grep /usr/bin/lxc-checkconfig")); + "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); list<string> rt = []; map<string,string> colors = $[ Modified: trunk/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/dialogs.ycp?rev=68050&r1… ============================================================================== --- trunk/lxc/src/dialogs.ycp (original) +++ trunk/lxc/src/dialogs.ycp Mon Apr 30 13:53:28 2012 @@ -46,6 +46,10 @@ map<string,integer> console_pids = $[]; +/** + * Create configuration file for a container + * @return success + */ boolean CreateContainerConfig (string name, string ip, string subnet, string bridge, string template) { // busy message @@ -76,16 +80,15 @@ 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) { + y2milestone ("cmd: %1", cmd); + y2milestone ("lxc-createconfig output: %1", out); + // error message Report::Error (sformat (_("Error occured during configuration: @@ -253,16 +256,16 @@ { 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) { + y2milestone ("cmd: %1", cmd); + y2milestone ("lxc-create output: %1", out); + Report::Error (sformat (_("Error occured during container creation: %1"), out["stdout"]:"")); @@ -295,6 +298,7 @@ /** * Start selected container + * @return success */ boolean StartContainer (string name) { @@ -324,7 +328,7 @@ */ void StopContainer (string name) { - y2internal ("lxc-stop: %1", + y2milestone ("result of lxc-stop: %1", SCR::Execute (.target.bash_output, "lxc-stop -n " + name) ); if (console_pids[name]:nil != nil) @@ -336,27 +340,28 @@ /** * Delete given container + * @return success */ -void DestroyContainer (string name) +boolean DestroyContainer (string name) { // busy message Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", 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); - Popup::ClearFeedback (); if (out["exit"]:0 != 0) { + y2milestone ("lxc-destroy output: %1", out); // error message Report::Error (sformat (_("Error while destroying: %1"), out["stdout"]:"")); + return false; } + return true; } /** @@ -384,6 +389,9 @@ // current container string selected = ""; + // mapping of containers to their state + map<string,boolean> lxc_map = $[]; + // update status of the buttons according to current item void update_buttons (string selected) { @@ -392,8 +400,7 @@ return; } - term line = (term) UI::QueryWidget (`id (`table), `Item (selected)); - boolean running = line[2]:"" == "RUNNING"; // TODO do some better test + boolean running = lxc_map[selected]:false; UI::ChangeWidget (`id (`start), `Enabled, !running); UI::ChangeWidget (`id (`stop), `Enabled, running); if (Lxc::textmode) @@ -420,7 +427,15 @@ // update table with fresh items void update_table () { - list<term> lxc_list = Lxc::GetContainers ();; + lxc_map = Lxc::GetContainers (); + list<term> lxc_list = maplist (string name, boolean status, lxc_map, { + return `item (name, status ? + // container status + _("Running") : + // container status + _("Stopped") + ); + }); UI::ChangeWidget (`id (`table), `Items, lxc_list); if (size (lxc_list) == 0) @@ -466,6 +481,7 @@ Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", Label::BackButton(), Label::FinishButton()); + Wizard::HideBackButton (); update_table (); Modified: trunk/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/helps.ycp?rev=68050&r1=6… ============================================================================== --- trunk/lxc/src/helps.ycp (original) +++ trunk/lxc/src/helps.ycp Mon Apr 30 13:53:28 2012 @@ -55,13 +55,13 @@ "create" : _("<big>Creating New Container</big>") + // Create dialog help, part 2 -_("Choose a Name, Template and enter network settings for the new container.") + +_("Choose a Name for your container, select a base Template, and enter desired network settings.") + // Create dialog help, part 3 -_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use Configure Network button and create one.") + +_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use the Configure Network button and create one.") + // Create dialog help, part 4 -_("Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.") + +_("Select a password to use for a system administrator ('root') in the container. If no password is entered, the default value <tt>root</tt> will be used.") + // Create dialog help, part 5 _("Use Create to start the creation process.") Modified: trunk/lxc/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/wizards.ycp?rev=68050&r1… ============================================================================== --- trunk/lxc/src/wizards.ycp (original) +++ trunk/lxc/src/wizards.ycp Mon Apr 30 13:53:28 2012 @@ -102,6 +102,7 @@ ]; Wizard::CreateDialog(); + Wizard::HideBackButton (); Wizard::HideAbortButton (); any ret = Sequencer::Run(aliases, sequence); -- 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] r68049 - /tags/branch-Code-11-SP2-2_17_6/lxc/
by jsuchome＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jsuchome Date: Mon Apr 30 13:53:18 2012 New Revision: 68049 URL: http://svn.opensuse.org/viewcvs/yast?rev=68049&view=rev Log: Created tag branch-Code-11-SP2-2_17_6 for lxc Added: tags/branch-Code-11-SP2-2_17_6/lxc/ - copied from r68048, branches/SuSE-Code-11-SP2-Branch/lxc/ -- 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] r68048 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/Lxc.ycp src/dialogs.ycp src/helps.ycp src/wizards.ycp yast2-lxc.spec.in
by jsuchome＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jsuchome Date: Mon Apr 30 13:53:09 2012 New Revision: 68048 URL: http://svn.opensuse.org/viewcvs/yast?rev=68048&view=rev Log: - updated help texts - cleaned debugging code, added comments - 2.17.6 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/Lxc.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in 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 30 13:53:09 2012 @@ -1 +1 @@ -2.17.5 +2.17.6 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 30 13:53:09 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 30 13:46:10 CEST 2012 - jsuchome(a)suse.cz + +- updated help texts +- cleaned debugging code, added comments +- 2.17.6 + +------------------------------------------------------------------- Fri Apr 27 13:21:01 CEST 2012 - jsuchome(a)suse.cz - updated help texts 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 30 13:53:09 2012 @@ -36,6 +36,7 @@ textdomain "lxc"; import "Directory"; +import "FileUtils"; import "Progress"; import "Security"; @@ -65,7 +66,9 @@ return ret; } -// encrypt given password using current method +/** + * Encrypt given password using current method + */ global string CryptPassword (string pw) { if (method == "md5") @@ -79,34 +82,40 @@ return crypt (pw); } +/** + * Read list of available bridges + */ global list<string> ReadBridgesIds () { - map out = (map) SCR::Execute (.target.bash_output, "brctl show | tail -n +2 | cut -f 1"); list<string> ret = []; - - if (out["stdout"]:"" != "") + if (FileUtils::Exists ("/sbin/brctl")) { - ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + map out = (map) SCR::Execute (.target.bash_output, "/sbin/brctl show | tail -n +2 | cut -f 1"); + + if (out["stdout"]:"" != "") + { + ret = maplist (string line, splitstring (out["stdout"]:"", "\n"), ``(line)); + } } return ret; } -global list<term> GetContainers () { +/** + * Read list of containers and their states + */ +global map<string,boolean> GetContainers () { - list<term> ret = []; - map lxc_index = $[]; + map<string,boolean> ret = $[]; map out = (map) SCR::Execute (.target.bash_output, "lxc-ls -1"); foreach (string line, sort (splitstring (out["stdout"]:"", "\n")), { - if (line != "" && !haskey (lxc_index, line)) + if (line != "" && !haskey (ret, 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; + ret[line] = state[1]:"" == "RUNNING"; } }); return ret; @@ -118,14 +127,13 @@ boolean CheckLXCConfiguration () { boolean problem = false; - // zgrep does not seem to work with .target.bash_output -> grep uncompressed config FIXME + // zgrep does not seem to work with .target.bash_output -> grep uncompressed config string tmpdir = Directory::tmpdir; SCR::Execute (.target.bash_output, sformat ( "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); map out = (map) SCR::Execute (.target.bash_output, sformat ( -// "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); - "GREP=grep /usr/bin/lxc-checkconfig")); + "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); list<string> rt = []; map<string,string> colors = $[ 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 30 13:53:09 2012 @@ -46,6 +46,10 @@ map<string,integer> console_pids = $[]; +/** + * Create configuration file for a container + * @return success + */ boolean CreateContainerConfig (string name, string ip, string subnet, string bridge, string template) { // busy message @@ -76,16 +80,15 @@ 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) { + y2milestone ("cmd: %1", cmd); + y2milestone ("lxc-createconfig output: %1", out); + // error message Report::Error (sformat (_("Error occured during configuration: @@ -253,16 +256,16 @@ { 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) { + y2milestone ("cmd: %1", cmd); + y2milestone ("lxc-create output: %1", out); + Report::Error (sformat (_("Error occured during container creation: %1"), out["stdout"]:"")); @@ -295,6 +298,7 @@ /** * Start selected container + * @return success */ boolean StartContainer (string name) { @@ -324,7 +328,7 @@ */ void StopContainer (string name) { - y2internal ("lxc-stop: %1", + y2milestone ("result of lxc-stop: %1", SCR::Execute (.target.bash_output, "lxc-stop -n " + name) ); if (console_pids[name]:nil != nil) @@ -336,27 +340,28 @@ /** * Delete given container + * @return success */ -void DestroyContainer (string name) +boolean DestroyContainer (string name) { // busy message Popup::ShowFeedback ("", sformat ("Destroying Container '%1'...", 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); - Popup::ClearFeedback (); if (out["exit"]:0 != 0) { + y2milestone ("lxc-destroy output: %1", out); // error message Report::Error (sformat (_("Error while destroying: %1"), out["stdout"]:"")); + return false; } + return true; } /** @@ -384,6 +389,9 @@ // current container string selected = ""; + // mapping of containers to their state + map<string,boolean> lxc_map = $[]; + // update status of the buttons according to current item void update_buttons (string selected) { @@ -392,8 +400,7 @@ return; } - term line = (term) UI::QueryWidget (`id (`table), `Item (selected)); - boolean running = line[2]:"" == "RUNNING"; // TODO do some better test + boolean running = lxc_map[selected]:false; UI::ChangeWidget (`id (`start), `Enabled, !running); UI::ChangeWidget (`id (`stop), `Enabled, running); if (Lxc::textmode) @@ -420,7 +427,15 @@ // update table with fresh items void update_table () { - list<term> lxc_list = Lxc::GetContainers ();; + lxc_map = Lxc::GetContainers (); + list<term> lxc_list = maplist (string name, boolean status, lxc_map, { + return `item (name, status ? + // container status + _("Running") : + // container status + _("Stopped") + ); + }); UI::ChangeWidget (`id (`table), `Items, lxc_list); if (size (lxc_list) == 0) @@ -466,6 +481,7 @@ Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", Label::BackButton(), Label::FinishButton()); + Wizard::HideBackButton (); update_table (); Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Mon Apr 30 13:53:09 2012 @@ -55,13 +55,13 @@ "create" : _("<big>Creating New Container</big>") + // Create dialog help, part 2 -_("Choose a Name, Template and enter network settings for the new container.") + +_("Choose a Name for your container, select a base Template, and enter desired network settings.") + // Create dialog help, part 3 -_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use Configure Network button and create one.") + +_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use the Configure Network button and create one.") + // Create dialog help, part 4 -_("Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.") + +_("Select a password to use for a system administrator ('root') in the container. If no password is entered, the default value <tt>root</tt> will be used.") + // Create dialog help, part 5 _("Use Create to start the creation process.") Modified: 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 (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Mon Apr 30 13:53:09 2012 @@ -102,6 +102,7 @@ ]; Wizard::CreateDialog(); + Wizard::HideBackButton (); Wizard::HideAbortButton (); any ret = Sequencer::Run(aliases, sequence); Modified: branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/y… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/yast2-lxc.spec.in Mon Apr 30 13:53:09 2012 @@ -6,7 +6,7 @@ BuildArchitectures: noarch -Summary: Configuration of lxc +Summary: Management tool for Linux Containers (LXC) %description - -- 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] r68047 - in /trunk/ruby-bindings: README modules/
by jreidinger＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: jreidinger Date: Mon Apr 30 13:14:06 2012 New Revision: 68047 URL: http://svn.opensuse.org/viewcvs/yast?rev=68047&view=rev Log: document exception handling in ruby bindidings and remove unused code Removed: trunk/ruby-bindings/modules/ Modified: trunk/ruby-bindings/README Modified: trunk/ruby-bindings/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/README?rev=68047&r… ============================================================================== --- trunk/ruby-bindings/README (original) +++ trunk/ruby-bindings/README Mon Apr 30 13:14:06 2012 @@ -15,3 +15,8 @@ Based on yast2-perl-bindings by Martin Vidner <mvidner(a)suse.cz> Stefan Hundhammer <sh(a)suse.de> + + +Exception handling +================= +When ruby code raise exception, then method return `nil` in YCP and add method last_exception, that returns message of exception. Also exception details are logged. -- 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] r68046 - /trunk/gtk/yast2-gtk.spec.in
by tgoettlicher＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: tgoettlicher Date: Mon Apr 30 11:28:06 2012 New Revision: 68046 URL: http://svn.opensuse.org/viewcvs/yast?rev=68046&view=rev Log: fixed typo Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=68046&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Mon Apr 30 11:28:06 2012 @@ -16,7 +16,7 @@ %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif -if 0%{?force_gcc_46} +%if 0%{?force_gcc_46} BuildRequires: gcc46 BuildRequires: gcc46-c++ %else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r68045 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes src/modules/Bootloader.ycp
by snwint＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: snwint Date: Mon Apr 30 11:10:05 2012 New Revision: 68045 URL: http://svn.opensuse.org/viewcvs/yast?rev=68045&view=rev Log: - don't do kexec on hyper-v (bnc#732693) - 2.23.3 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/Bootloader.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=68045&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Mon Apr 30 11:10:05 2012 @@ -1 +1 @@ -2.23.2 +2.23.3 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 30 11:10:05 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 24 15:06:19 CEST 2012 - snwint(a)suse.de + +- don't do kexec on hyper-v (bnc#732693) +- 2.23.3 + +------------------------------------------------------------------- Mon Apr 23 12:40:24 CEST 2012 - mchang(a)suse.com - add "Boot Loader Options" dialog for grub2-efi that provides widgets for Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Mon Apr 30 11:10:05 2012 @@ -1372,7 +1372,6 @@ * @param map<string,any> boot section * @return map<string,any> updated boot section */ - map<string,any> updateAppend(map<string,any> section) { map<string,any> ret = section; @@ -1386,6 +1385,64 @@ } return ret; } + + +/** + * Get entry from DMI data returned by .probe.bios. + * + * @param list<map> bios_data: result of SCR::Read(.probe.bios) + * @param string section: section name + * @param string key: key in section + * @return string: entry + */ +string DMIRead (list<map> bios_data, string section, string key) { + string result = ""; + + foreach (map x, bios_data[0, "smbios"]:[], { + if (x["type"]:"" == section) { + result = x[key]:""; + break; + } + }); + + y2milestone ("Bootloader::DMIRead(%1, %2) = %3", section, key, result); + + return result; +} + + +/** + * Check if we run in a vbox vm. + * + * @param list<map> bios_data: result of SCR::Read(.probe.bios) + * @return boolean: true if yast runs in a vbox vm + */ +boolean IsVirtualBox (list<map> bios_data) { + boolean r = DMIRead(bios_data, "sysinfo", "product") == "VirtualBox"; + + y2milestone("Bootloader::IsVirtualBox = %1", r); + + return r; +} + + +/** + * Check if we run in a hyperv vm. + * + * @param list<map> bios_data: result of SCR::Read(.probe.bios) + * @return boolean: true if yast runs in a hyperv vm + */ +boolean IsHyperV (list<map> bios_data) { + boolean r = + DMIRead(bios_data, "sysinfo", "manufacturer") == "Microsoft Corporation" && + DMIRead(bios_data, "sysinfo", "product") == "Virtual Machine"; + + y2milestone("Bootloader::IsHyperV = %1", r); + + return r; +} + + /** * Copy initrd and kernel on the end of instalation * (1st stage) @@ -1418,20 +1475,21 @@ return true; } + list<map> bios_data = (list<map>) SCR::Read(.probe.bios); - // checking if installation run on VirtualBox - string cmd = sformat("hwinfo --bios |grep Product"); - y2milestone("Checking if installation run on VirtualBox command: %1", cmd); + y2milestone("CopyKernelInird::bios_data = %1", bios_data); - map out = (map)WFM::Execute(.local.bash_output, cmd); + if (IsVirtualBox(bios_data)) { + y2milestone ("Installation run on VirtualBox, skip kexec loading"); + return false; + } - if (search(out["stdout"]:"", "VirtualBox") != nil) - { - y2milestone ("Installation run on VirtualBox, skip kexec loading: %1", out); + if (IsHyperV(bios_data)) { + y2milestone ("Installation run on HyperV, skip kexec loading"); return false; } - // create defualt sections + // create default sections map<string,any> linux_default = BootCommon::CreateLinuxSection ("linux"); y2milestone("linux_default: %1", linux_default); @@ -1455,7 +1513,7 @@ WFM::Execute(.local.mkdir, "/var/lib/YaST2"); // build command for copy kernel and initrd to /var/lib/YaST during instalation - cmd = nil; + string cmd = nil; default_section = updateAppend(default_section); @@ -1463,7 +1521,7 @@ tostring(default_section["initrd"]:""), Directory::vardir); y2milestone("Command for copy: %1", cmd); - out = (map) WFM::Execute (.local.bash_output, cmd); + map out = (map) WFM::Execute (.local.bash_output, cmd); if (out["exit"]:nil != 0) { y2error ("Copy kernel and initrd failed, output: %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] r68044 - /trunk/gtk/yast2-gtk.spec.in
by tgoettlicher＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: tgoettlicher Date: Mon Apr 30 10:58:37 2012 New Revision: 68044 URL: http://svn.opensuse.org/viewcvs/yast?rev=68044&view=rev Log: fix for gcc47 Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=68044&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Mon Apr 30 10:58:37 2012 @@ -16,6 +16,13 @@ %if 0%{?suse_version} < 1220 BuildRequires: libxcrypt-devel %endif +if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif + Requires: gtk3 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 @@ -46,6 +53,10 @@ %install cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif make install DESTDIR=$RPM_BUILD_ROOT cd .. -- 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] r68043 - /trunk/gtk/yast2-gtk.spec.in
by tgoettlicher＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: tgoettlicher Date: Mon Apr 30 10:41:26 2012 New Revision: 68043 URL: http://svn.opensuse.org/viewcvs/yast?rev=68043&view=rev Log: minor fix Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=68043&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Mon Apr 30 10:41:26 2012 @@ -14,7 +14,7 @@ BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 %if 0%{?suse_version} < 1220 -uildRequires: libxcrypt-devel +BuildRequires: libxcrypt-devel %endif Requires: gtk3 Requires: yast2-libyui >= 2.18.8 -- 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] r68042 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/YGUI.cc
by tgoettlicher＠svn2.opensuse.org 30 Apr '12

30 Apr '12

Author: tgoettlicher Date: Mon Apr 30 10:36:18 2012 New Revision: 68042 URL: http://svn.opensuse.org/viewcvs/yast?rev=68042&view=rev Log: fixed build Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGUI.cc Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=68042&r1=68041&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Mon Apr 30 10:36:18 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=68042&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Mon Apr 30 10:36:18 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "5") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Mon Apr 30 10:36:18 2012 @@ -1,17 +1,23 @@ ------------------------------------------------------------------- +Mon Apr 30 10:25:22 CEST 2012 - tgoettlicher(a)suse.de + +- Fix for bnc #722053 by Michael Meeks +- 2.22.5 + +------------------------------------------------------------------- Fri Mar 16 15:27:50 CET 2012 - tgoettlicher(a)suse.de - Fix for bnc #751309: markup of release notes - 2.22.4 ------------------------------------------------------------------- -Sat Sep 07:02:00 UTC 2011 - rpmcruz(a)alunos.dcc.fc.up.pt +Sat Sep 08 07:02:00 UTC 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - disabled building of test-cases; broken in obs. - 2.22.3 ------------------------------------------------------------------- -Fri Sep 23:50:00 UTC 2011 - rpmcruz(a)alunos.dcc.fc.up.pt +Fri Sep 07 23:50:00 UTC 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - layout issues for the manual conflicts resolver and other sw_single dialogs. (bnc#716336) Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=68042&r1=680… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Apr 30 10:36:18 2012 @@ -17,7 +17,7 @@ #include "YGi18n.h" #include "YGUtils.h" #include "YGDialog.h" -#include <glib/gthread.h> +#include <glib.h> static std::string askForFileOrDirectory (GtkFileChooserAction action, const std::string &path, const std::string &filter, const std::string &title); -- 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] r68041 - /trunk/gtk/src/YGDialog.cc
by michael_meeks＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: michael_meeks Date: Fri Apr 27 18:13:39 2012 New Revision: 68041 URL: http://svn.opensuse.org/viewcvs/yast?rev=68041&view=rev Log: fix egregious bnc#722053 layout issues, dialog text now fits. Modified: trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=68041&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Apr 27 18:13:39 2012 @@ -375,17 +375,16 @@ { // libyui calls YDialog::setSize() to force a geometry recalculation as a // result of changed layout properties + bool resize = false; GtkWidget *window = m_window->getWidget(); if (gtk_widget_get_realized (window)) { gtk_widget_queue_resize (window); width = MIN (width, YUI::app()->displayWidth()); height = MIN (height, YUI::app()->displayHeight()); -#if 1 - bool resize = false; if (isMainDialog()) { - GtkAllocation allocation; - gtk_widget_get_allocation(window, &allocation); - if (allocation.width < width || allocation.height < height) { + GtkAllocation allocation; + gtk_widget_get_allocation(window, &allocation); + if (allocation.width < width || allocation.height < height) { resize = true; width = MAX (width, allocation.width), height = MAX (height, allocation.height); @@ -393,12 +392,11 @@ } else resize = true; - if (resize) -#else - if (!isMainDialog()) -#endif - gtk_window_resize (GTK_WINDOW (window), width, height); } + if (resize) + gtk_window_resize (GTK_WINDOW (window), width, height); + else + gtk_window_set_default_size (GTK_WINDOW (window), width, height); } void YGDialog::highlight (YWidget *ywidget) -- 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] r68040 - /trunk/gtk/src/ygtkwindow.c
by michael_meeks＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: michael_meeks Date: Fri Apr 27 18:05:48 2012 New Revision: 68040 URL: http://svn.opensuse.org/viewcvs/yast?rev=68040&view=rev Log: hook a few methods to help out with size debugging. Modified: trunk/gtk/src/ygtkwindow.c Modified: trunk/gtk/src/ygtkwindow.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwindow.c?rev=68040&r… ============================================================================== --- trunk/gtk/src/ygtkwindow.c (original) +++ trunk/gtk/src/ygtkwindow.c Fri Apr 27 18:05:48 2012 @@ -18,20 +18,27 @@ GtkWidget* ygtk_window_new (void) { return g_object_new (YGTK_TYPE_WINDOW, NULL); } -void ygtk_window_get_preferred_width (GtkWidget *widget, - gint *minimum_width, gint *natural_width) +static void ygtk_window_get_preferred_width (GtkWidget *widget, + gint *minimum_width, gint *natural_width) { GTK_WIDGET_CLASS (ygtk_window_parent_class)->get_preferred_width(widget, minimum_width, natural_width); *minimum_width = 0; } -void ygtk_window_get_preferred_height (GtkWidget *widget, - gint *minimum_height, gint *natural_height) +static void ygtk_window_get_preferred_height (GtkWidget *widget, + gint *minimum_height, gint *natural_height) { GTK_WIDGET_CLASS (ygtk_window_parent_class)->get_preferred_height(widget, minimum_height, natural_height); *minimum_height = 0; } +static void +ygtk_window_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GTK_WIDGET_CLASS (ygtk_window_parent_class)->size_allocate(widget, allocation); +} + static void ygtk_window_class_init (YGtkWindowClass *klass) { ygtk_window_parent_class = g_type_class_peek_parent (klass); @@ -39,5 +46,6 @@ GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); widget_class->get_preferred_width = ygtk_window_get_preferred_width; widget_class->get_preferred_height = ygtk_window_get_preferred_height; + widget_class->size_allocate = ygtk_window_size_allocate; } -- 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] r68039 - /trunk/gtk/Makefile
by michael_meeks＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: michael_meeks Date: Fri Apr 27 18:02:21 2012 New Revision: 68039 URL: http://svn.opensuse.org/viewcvs/yast?rev=68039&view=rev Log: remove generated makefile, use cmake to re-create it Removed: trunk/gtk/Makefile -- 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] r68038 - /trunk/gtk/README
by michael_meeks＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: michael_meeks Date: Fri Apr 27 17:12:49 2012 New Revision: 68038 URL: http://svn.opensuse.org/viewcvs/yast?rev=68038&view=rev Log: update for cmake / debugging Modified: trunk/gtk/README Modified: trunk/gtk/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/README?rev=68038&r1=68037&r2… ============================================================================== --- trunk/gtk/README (original) +++ trunk/gtk/README Fri Apr 27 17:12:49 2012 @@ -23,6 +23,7 @@ Building / Installing + cmake -D CMAKE_INSTALL_PREFIX=/usr -f CMakeLists.txt make && sudo make install [1] [1] - if you want sudo not to ask you a password, add yourself to the @@ -30,6 +31,7 @@ Running + export Y2DEBUG=1 /usr/lib/YaST2/bin/y2base /usr/share/doc/packages/yast2-core/libyui/examples/HelloWorld.ycp gtk From OpenSuse 10.3 on, it should be picked up automatically if you use Gnome. -- 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] r68037 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes yast2-control-center.spec.in
by tgoettlicher＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: tgoettlicher Date: Fri Apr 27 15:26:06 2012 New Revision: 68037 URL: http://svn.opensuse.org/viewcvs/yast?rev=68037&view=rev Log: gcc 4.7 fix Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Fri Apr 27 15:26:06 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri Apr 27 15:26:06 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 27 15:25:14 CEST 2012 - tgoettlicher(a)suse.de + +- workaround for gcc 4.7 +- Version: 2.22.2 + +------------------------------------------------------------------- Thu Mar 15 18:29:56 CET 2012 - aschnell(a)suse.de - added missing include for gcc 4.7 Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-cen… ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Fri Apr 27 15:26:06 2012 @@ -7,6 +7,14 @@ BuildRequires: libdrm-devel libjpeg-devel pkgconfig libqt4-devel update-desktop-files yast2-devtools BuildRequires: cmake +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif + + Summary: YaST2 - Control Center Requires: yast2 yast2-control-center-binary Provides: y2c_menu y2m_menu yast2-menu @@ -35,6 +43,11 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif + export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -- 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] r68036 - /tags/stable-2_22_0/lxc/
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 15:22:10 2012 New Revision: 68036 URL: http://svn.opensuse.org/viewcvs/yast?rev=68036&view=rev Log: Created tag stable-2_22_0 for lxc Added: tags/stable-2_22_0/lxc/ - copied from r68035, trunk/lxc/ -- 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] r68035 - in /trunk/lxc: ./ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 15:19:45 2012 New Revision: 68035 URL: http://svn.opensuse.org/viewcvs/yast?rev=68035&view=rev Log: new module for LXC Added: trunk/lxc/ trunk/lxc/MAINTAINER trunk/lxc/Makefile.cvs trunk/lxc/RPMNAME trunk/lxc/VERSION trunk/lxc/_cvsignore trunk/lxc/configure.in.in trunk/lxc/doc/ trunk/lxc/doc/Makefile.am trunk/lxc/doc/_cvsignore trunk/lxc/doc/autodocs/ trunk/lxc/doc/autodocs/Makefile.am trunk/lxc/doc/autodocs/_cvsignore trunk/lxc/package/ trunk/lxc/package/_cvsignore trunk/lxc/package/yast2-lxc.changes trunk/lxc/src/ trunk/lxc/src/Lxc.ycp (with props) trunk/lxc/src/Makefile.am trunk/lxc/src/_cvsignore trunk/lxc/src/dialogs.ycp (with props) trunk/lxc/src/helps.ycp (with props) trunk/lxc/src/lxc.desktop trunk/lxc/src/lxc.ycp (with props) trunk/lxc/src/wizards.ycp (with props) trunk/lxc/testsuite/ trunk/lxc/testsuite/Makefile.am trunk/lxc/testsuite/_cvsignore trunk/lxc/testsuite/tests/ trunk/lxc/testsuite/tests/_cvsignore trunk/lxc/yast2-lxc.spec.in Added: trunk/lxc/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/MAINTAINER?rev=68035&view=au… ============================================================================== --- trunk/lxc/MAINTAINER (added) +++ trunk/lxc/MAINTAINER Fri Apr 27 15:19:45 2012 @@ -0,0 +1 @@ +Jiri Suchomel <jsuchome(a)suse.cz> Added: trunk/lxc/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/Makefile.cvs?rev=68035&view=… ============================================================================== --- trunk/lxc/Makefile.cvs (added) +++ trunk/lxc/Makefile.cvs Fri Apr 27 15:19:45 2012 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/lxc/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/RPMNAME?rev=68035&view=auto ============================================================================== --- trunk/lxc/RPMNAME (added) +++ trunk/lxc/RPMNAME Fri Apr 27 15:19:45 2012 @@ -0,0 +1 @@ +yast2-lxc Added: trunk/lxc/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/VERSION?rev=68035&view=auto ============================================================================== --- trunk/lxc/VERSION (added) +++ trunk/lxc/VERSION Fri Apr 27 15:19:45 2012 @@ -0,0 +1 @@ +2.22.0 Added: trunk/lxc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/_cvsignore?rev=68035&view=au… ============================================================================== --- trunk/lxc/_cvsignore (added) +++ trunk/lxc/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +lxc.pot +autom4te.cache Added: trunk/lxc/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/configure.in.in?rev=68035&vi… ============================================================================== --- trunk/lxc/configure.in.in (added) +++ trunk/lxc/configure.in.in Fri Apr 27 15:19:45 2012 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/lxc/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/doc/Makefile.am?rev=68035&vi… ============================================================================== --- trunk/lxc/doc/Makefile.am (added) +++ trunk/lxc/doc/Makefile.am Fri Apr 27 15:19:45 2012 @@ -0,0 +1,10 @@ +# Makefile.am for lxc/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/lxc/doc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/doc/_cvsignore?rev=68035&vie… ============================================================================== --- trunk/lxc/doc/_cvsignore (added) +++ trunk/lxc/doc/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/lxc/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/doc/autodocs/Makefile.am?rev… ============================================================================== --- trunk/lxc/doc/autodocs/Makefile.am (added) +++ trunk/lxc/doc/autodocs/Makefile.am Fri Apr 27 15:19:45 2012 @@ -0,0 +1,3 @@ +# Makefile.am for lxc/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/lxc/doc/autodocs/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/doc/autodocs/_cvsignore?rev=… ============================================================================== --- trunk/lxc/doc/autodocs/_cvsignore (added) +++ trunk/lxc/doc/autodocs/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: trunk/lxc/package/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/package/_cvsignore?rev=68035… ============================================================================== --- trunk/lxc/package/_cvsignore (added) +++ trunk/lxc/package/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: trunk/lxc/package/yast2-lxc.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/package/yast2-lxc.changes?re… ============================================================================== --- trunk/lxc/package/yast2-lxc.changes (added) +++ trunk/lxc/package/yast2-lxc.changes Fri Apr 27 15:19:45 2012 @@ -0,0 +1,49 @@ +------------------------------------------------------------------- +Fri Apr 27 14:48:38 CEST 2012 - jsuchome(a)suse.cz + +- openSUSE version +- 2.22.0 + +------------------------------------------------------------------- +Fri Apr 27 13:21:01 CEST 2012 - jsuchome(a)suse.cz + +- updated help texts +- try to higlight lxc-checkconfig output in ncurses +- 2.17.5 + +------------------------------------------------------------------- +Thu Apr 26 16:06:25 CEST 2012 - jsuchome(a)suse.cz + +- check if configuration is prepared +- updated help texts +- 2.17.4 + +------------------------------------------------------------------- +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 +- start container in background, allow connect via console +- 2.17.2 + +------------------------------------------------------------------- +Fri Apr 20 12:38:23 CEST 2012 - jsuchome(a)suse.cz + +- read bridges id's +- explicit buttons for Create/Start/Destroy +- 2.17.1 + +------------------------------------------------------------------- +Fri Apr 13 13:01:03 2012 - jsuchome(a)suse.cz + +- initial version Added: trunk/lxc/src/Lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/Lxc.ycp?rev=68035&view=a… ============================================================================== --- trunk/lxc/src/Lxc.ycp (added) +++ trunk/lxc/src/Lxc.ycp Fri Apr 27 15:19:45 2012 @@ -0,0 +1,253 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 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: modules/Lxc.ycp + * Package: Configuration of lxc + * Summary: Lxc settings, input and output functions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Representation of the configuration of lxc. + * Input and output routines. + */ + +{ + +module "Lxc"; +textdomain "lxc"; + +import "Directory"; +import "Progress"; +import "Security"; + + +// text or graphic mode? +global boolean textmode = false; + +// current password encryption method +string method = "des"; + +// 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")); + } + }); + } + return ret; +} + +// encrypt given password using current method +global string CryptPassword (string pw) { + + 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); +} + +global list<string> ReadBridgesIds () { + + 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; +} + +global list<term> GetContainers () { + + 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 != "" && !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; +} + +/** + * Check if LXC is correctly configured + */ +boolean CheckLXCConfiguration () { + + boolean problem = false; + // zgrep does not seem to work with .target.bash_output -> grep uncompressed config FIXME + string tmpdir = Directory::tmpdir; + SCR::Execute (.target.bash_output, sformat ( + "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); + + map out = (map) SCR::Execute (.target.bash_output, sformat ( +// "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); + "GREP=grep /usr/bin/lxc-checkconfig")); + + list<string> rt = []; + map<string,string> colors = $[ + "blue" : "\033[1;32m", + "red" : "\033[1;31m", + "yellow" : "\033[1;33m" + ]; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + boolean colored = false; + foreach (string name, string color, colors, { + if (colored) + { + break; + } + integer found = find (line, color); + if (found != nil && found > 0) + { + if (textmode) + { + line = sformat ("%1%2", + substring (line, 0, found), + substring (line, found + size (color)) + ); + } + else + { + line = sformat ("%1%3", + substring (line, 0, found), + name, + substring (line, found + size (color)) + ); + } + colored = true; + if (name == "red" || name == "yellow") + problem = true; + } + }); + // 'normalizing' color + integer found = find (line, "\033[0;39m"); + if (found != nil && found >= 0) + { + line = substring (line, 0, found) + + substring (line, found + size ( "\033[0;39m")); + } + rt = add (rt, line); + }); + + if (!problem) + { + return true; + } + + UI::OpenDialog (`opt(`decorated), `HBox(`HSpacing(1.5), + `VSpacing (30), + `VBox ( + `HSpacing(85), + `VSpacing(0.5), + // info label (try to keep the text short) + `Label (_("Some problems with LXC configuration were found. Check the documentation for details.")), + `VSpacing(0.5), + // output follows in widget below + `Left (`Label (_("Output of 'lxc-checkconfig' script:"))), + `RichText (`id (`rt), mergestring (rt, " ")), + `PushButton ("OK") + ))); + + UI::UserInput (); + UI::CloseDialog (); + + return false; +} + +/** + * Read all lxc settings + * @return true on success + */ +global boolean Read() { + + /* Lxc read dialog caption */ + string caption = _("Initializing LXC Configuration"); + + integer steps = 2; + + // We do not set help text here, because it was set outside + Progress::New( caption, " ", steps, [ + // Progress stage + _("Check LXC availability"), + // Progress stage + _("Read system settings"), + ], [ + // Progress step + _("Check LXC availability..."), + // Progress step + _("Reading system settings..."), + // Progress finished + _("Finished") + ], + "" + ); + + + Progress::NextStage(); + + textmode = UI::GetDisplayInfo()["TextMode"]:false; + + CheckLXCConfiguration (); + + Progress::NextStage(); + + boolean orig = Progress::set (false); + + Security::Read (); + + Progress::set (orig); + + map security = Security::Export (); + method = tolower (security["PASSWD_ENCRYPTION"]:"des"); + + Progress::NextStage(); + + return true; +} + +/* EOF */ +} Added: trunk/lxc/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/Makefile.am?rev=68035&vi… ============================================================================== --- trunk/lxc/src/Makefile.am (added) +++ trunk/lxc/src/Makefile.am Fri Apr 27 15:19:45 2012 @@ -0,0 +1,26 @@ +# Makefile.am for lxc/src + +yncludedir = @yncludedir@/lxc + +client_DATA = \ + lxc.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp + +desktop_DATA = \ + lxc.desktop + +module_DATA = \ + Lxc.ycp + +# create a symlink for local build, #145327 +lxc: + ln -sf . $@ +ycpchook = lxc + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/lxc/src/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/_cvsignore?rev=68035&vie… ============================================================================== --- trunk/lxc/src/_cvsignore (added) +++ trunk/lxc/src/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: trunk/lxc/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/dialogs.ycp?rev=68035&vi… ============================================================================== --- trunk/lxc/src/dialogs.ycp (added) +++ trunk/lxc/src/dialogs.ycp Fri Apr 27 15:19:45 2012 @@ -0,0 +1,548 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 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/dialogs.ycp + * Package: Configuration of lxc + * Summary: Dialogs definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +import "FileUtils"; +import "IP"; +import "Label"; +import "Popup"; +import "Progress"; +import "Report"; +import "Security"; +import "Wizard"; + +include "lxc/helps.ycp"; + +// 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) +{ + // 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; +} + +/** + * Dialog for adding new Linux Container + * @return dialog result + */ +any AddDialog () { + + // add dialog caption + string caption = _("Adding New Container"); + + list<term> template_items = Lxc::ReadTemplates (); + + term contents = `HBox (`HSpacing (), `VBox ( + `VSpacing (), + // frame label + `Frame (_("New Container"), `HBox ( + `HSpacing (0.5), + // text entry + `Left (`TextEntry (`id (`name), _("Name"))), + `HSpacing (), + // combo box label + `ComboBox (`id (`template), _("Template"), template_items) + )), + `VSpacing (), + // frame label + `Frame (_("Network Settings"), `HBox ( + `HSpacing (0.5), `VBox ( + `HBox ( + // text entry label + `TextEntry (`id (`ip), _("IP Address"), "0.0.0.0"), + `HSpacing (), + // text entry label + `TextEntry (`id (`subnet), _("Subnet"), "/24"), + `HSpacing (), + `ReplacePoint (`id (`rp_lan), + // combo box label + `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) + ) + ), + `VSpacing (0.5), + `Right ( + // push button label + `PushButton (`id (`lan), _("Configure Network...")) + ) + ), + `HSpacing (0.5) + )), + `VSpacing (), + // frame label + `Frame (_("Password Settings"), `HBox ( + `HSpacing (0.5), + // password entry + `HWeight (1, `Password (`id (`pw1), _("Root Password"))), + // password entry + `HWeight (1, `Password (`id (`pw2), _("Repeat Password"))), + `HSpacing (0.5) + )), + `VSpacing (2), + `ReplacePoint (`id (`rp_status), + `Label (`id (`status), "") + ), + `VSpacing () + ), `HSpacing ()); + + Wizard::SetContentsButtons(caption, contents, HELPS["create"]:"", + // button label + Label::CancelButton(), _("Create")); + + UI::ChangeWidget (`id (`ip), `ValidChars, IP::ValidChars4); + + any ret = nil; + while (true) { + + ret = UI::UserInput(); + + if (ret == `abort || ret == `cancel || ret == `back) { + break; + } + + if (ret == `lan) + { + WFM::CallFunction ("lan"); + UI::ReplaceWidget (`id (`rp_lan), + // combo box label + `ComboBox (`id (`bridge), _("Bridge"), Lxc::ReadBridgesIds ()) + ); + continue; + } + + string name = (string) UI::QueryWidget (`id (`name), `Value); + string ip = (string) UI::QueryWidget (`id (`ip), `Value); + string subnet = (string) UI::QueryWidget (`id (`subnet), `Value); + string bridge = (string) UI::QueryWidget (`id (`bridge), `Value); + string template = (string) UI::QueryWidget (`id (`template), `Value); + string pw1 = (string) UI::QueryWidget (`id (`pw1), `Value); + string pw2 = (string) UI::QueryWidget (`id (`pw2), `Value); + + if (name == "") + { + // error popup + Report::Error (_("Name was not entered.")); + UI::SetFocus (`id (`name)); + continue; + } + + if (ip != "" && !IP::Check (ip)) + { + Report::Error (IP::Valid4 ()); + UI::SetFocus (`id (`ip)); + continue; + } + if (pw1 != pw2) + { + // error message + Report::Error (_("The passwords do not match.")); + UI::SetFocus (`id (`pw1)); + continue; + } + + if (ret == `next) + { + string config_file = sformat ("/root/%1.config", name); + boolean create_config = true; + + if (FileUtils::Exists (config_file)) + { + 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)) + { + SCR::Execute (.target.remove, config_file); + } + else + { + create_config = false; + } + } + + if (create_config && + CreateContainerConfig (name, ip, subnet, bridge, template) == false) + { + continue; + } + + // busy message + Popup::ShowFeedback ("", sformat (_("Creating Container %1..."), name)); + + // lxc-create -n <name> -f /root/<name>.config -t <template> + string cmd = sformat ("lxc-create -n %1 -f /root/%1.config", name); + 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) + { + Report::Error (sformat (_("Error occured during container creation: + +%1"), out["stdout"]:"")); + continue; + } + + // busy message + Popup::ShowFeedback ("", _("Saving Root Password...")); + + string password = Lxc::CryptPassword (pw1); + + string file = sformat ("/var/lib/lxc/%1/rootfs/etc/shadow", name); + if (pw1 != "" && FileUtils::Exists (file)) + { + // slash would break sed command + password = mergestring (splitstring (password, "/"), "\\/"); + // change the root password in the file /var/lib/lxc/<name>/rootfs/etc/shadow/ + cmd = sformat ("sed --in-place 's/^root:[^:]*:/root:%1:/' %2", password, file); + out = (map) SCR::Execute (.target.bash_output, cmd); + y2security ("out: %1", out); + } + Popup::ClearFeedback (); + Popup::Message (sformat (_("Container '%1' was successfully created."), name)); + break; + } + } + return ret; +} + + +/** + * 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); + + 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 -n " + name; +// string cmd = "lxc-destroy -f -n " + name; + 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 while destroying: + +%1"), out["stdout"]:"")); + } +} + +/** + * Launch console for selected container + * Return PID of console process + */ +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 + */ +any OverviewDialog () { + + // LXC overview dialog caption + string caption = _("LXC Configuration"); + + // 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 () { + + list<term> lxc_list = Lxc::GetContainers ();; + + UI::ChangeWidget (`id (`table), `Items, lxc_list); + 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, `immediate), `header(_("Name"), _("Status")), []), + `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")), + `ReplacePoint (`id (`rp_console), + Lxc::textmode ? `HBox () : + // button label + `PushButton (`id (`connect), _("Connect")) + ) + ), + `VSpacing () + ), `HSpacing ()); + + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", + Label::BackButton(), Label::FinishButton()); + + update_table (); + + any ret = nil; + + 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; + } + + if (ret == `add_button) { + ret = `add; + break; + } + 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 (); + } + + if (ret == `connect && console_pid == nil) { + console_pids[selected] = Connect (selected); + update_buttons (selected); + } + + 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_pids = remove (console_pids, selected); + update_buttons (selected); + } + + if (ret == `stop) { + StopContainer (selected); + update_table (); + } + + if (ret == `destroy && Popup::YesNo (sformat (_("Are you sure to delete container '%1'?"), selected))) { + StopContainer (selected); + DestroyContainer (selected); + update_table (); + } + } + + return ret; +} + +/* EOF */ +} Added: trunk/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/helps.ycp?rev=68035&view… ============================================================================== --- trunk/lxc/src/helps.ycp (added) +++ trunk/lxc/src/helps.ycp Fri Apr 27 15:19:45 2012 @@ -0,0 +1,73 @@ +/* ------------------------------------------------------------------------------ + * 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/helps.ycp + * Package: Configuration of lxc + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help */ + "read" : _("<big>Initializing LXC Configuration</big> +Please wait... +"), + + // Overview dialog help, part 1 + "overview" : _("<big>LXC Overview</big> +Here, see the list of configured Linux Containers (LXC) with their current status. +Use Create to create new container. Delete existing one with Destroy. +") + + + // Overview dialog help, part 2 +_("You can start selected container with Start. The container is started in background. You can connect to it using Connect button or manually using <tt>lxc-console</tt> command. Once in console, you can close it from within or using the Disconnect button. +Note that Connect option is not available in text mode."), + + // Create dialog help, part 1 + "create" : _("<big>Creating New Container</big>") + + + // Create dialog help, part 2 +_("Choose a Name, Template and enter network settings for the new container.") + + + // Create dialog help, part 3 +_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use Configure Network button and create one.") + + + // Create dialog help, part 4 +_("Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.") + + + // Create dialog help, part 5 +_("Use Create to start the creation process.") + + +]; + +/* EOF */ +} Added: trunk/lxc/src/lxc.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/lxc.desktop?rev=68035&vi… ============================================================================== --- trunk/lxc/src/lxc.desktop (added) +++ trunk/lxc/src/lxc.desktop Fri Apr 27 15:19:45 2012 @@ -0,0 +1,23 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=lxc + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=lxc + +Icon=yast-lxc +Exec=/usr/bin/xdg-su -c '/sbin/yast2 lxc' + +Name=Lxc +GenericName=lxc +StartupNotify=true Added: trunk/lxc/src/lxc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/lxc.ycp?rev=68035&view=a… ============================================================================== --- trunk/lxc/src/lxc.ycp (added) +++ trunk/lxc/src/lxc.ycp Fri Apr 27 15:19:45 2012 @@ -0,0 +1,78 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 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: clients/lxc.ycp + * Package: Configuration of lxc + * Summary: Main file + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Main file for lxc configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of lxc</h3> + */ + +textdomain "lxc"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("Lxc module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "lxc/wizards.ycp"; + +map cmdline_description = $[ + "id" : "lxc", + /* Command line help text for the Xlxc module */ + "help" : _("Configuration of LXC"), + "guihandler" : LxcSequence, + "initialize" : Lxc::Read, + "actions" : $[ + ], + "options" : $[ + ], + "mappings" : $[ + ] +]; + +/* main ui function */ +any ret = nil; + +ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("Lxc module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/lxc/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/src/wizards.ycp?rev=68035&vi… ============================================================================== --- trunk/lxc/src/wizards.ycp (added) +++ trunk/lxc/src/wizards.ycp Fri Apr 27 15:19:45 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() { + Wizard::RestoreHelp(HELPS["read"]:""); + 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 (); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + +/* EOF */ +} Added: trunk/lxc/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/testsuite/Makefile.am?rev=68… ============================================================================== --- trunk/lxc/testsuite/Makefile.am (added) +++ trunk/lxc/testsuite/Makefile.am Fri Apr 27 15:19:45 2012 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/lxc/testsuite/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/testsuite/_cvsignore?rev=680… ============================================================================== --- trunk/lxc/testsuite/_cvsignore (added) +++ trunk/lxc/testsuite/_cvsignore Fri Apr 27 15:19:45 2012 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: trunk/lxc/testsuite/tests/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/testsuite/tests/_cvsignore?r… ============================================================================== (empty) Added: trunk/lxc/yast2-lxc.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/lxc/yast2-lxc.spec.in?rev=68035&… ============================================================================== --- trunk/lxc/yast2-lxc.spec.in (added) +++ trunk/lxc/yast2-lxc.spec.in Fri Apr 27 15:19:45 2012 @@ -0,0 +1,29 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 yast2-security lxc +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-security + +BuildArchitectures: noarch + +Summary: Management tool for Linux Containers (LXC) + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/lxc +@yncludedir@/lxc/* +@clientdir@/lxc.ycp +@moduledir@/Lxc.* +@desktopdir@/lxc.desktop +%doc @docdir@ -- 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] r68034 - /tags/branch-Code-11-SP2-2_17_5/lxc/
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 13:34:00 2012 New Revision: 68034 URL: http://svn.opensuse.org/viewcvs/yast?rev=68034&view=rev Log: Created tag branch-Code-11-SP2-2_17_5 for lxc Added: tags/branch-Code-11-SP2-2_17_5/lxc/ - copied from r68033, branches/SuSE-Code-11-SP2-Branch/lxc/ -- 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] r68033 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/Lxc.ycp src/dialogs.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: jsuchome Date: Fri Apr 27 13:33:33 2012 New Revision: 68033 URL: http://svn.opensuse.org/viewcvs/yast?rev=68033&view=rev Log: - updated help texts - try to higlight lxc-checkconfig output in ncurses - 2.17.5 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/Lxc.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.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 Fri Apr 27 13:33:33 2012 @@ -1 +1 @@ -2.17.4 +2.17.5 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 Fri Apr 27 13:33:33 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 27 13:21:01 CEST 2012 - jsuchome(a)suse.cz + +- updated help texts +- try to higlight lxc-checkconfig output in ncurses +- 2.17.5 + +------------------------------------------------------------------- Thu Apr 26 16:06:25 CEST 2012 - jsuchome(a)suse.cz - check if configuration is prepared 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 27 13:33:33 2012 @@ -124,7 +124,8 @@ "cp /proc/config.gz %1/ && gunzip %1/config.gz", tmpdir)); map out = (map) SCR::Execute (.target.bash_output, sformat ( - "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); +// "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); + "GREP=grep /usr/bin/lxc-checkconfig")); list<string> rt = []; map<string,string> colors = $[ @@ -142,11 +143,21 @@ integer found = find (line, color); if (found != nil && found > 0) { - line = sformat ("%1%3", + if (textmode) + { + line = sformat ("%1%2", + substring (line, 0, found), + substring (line, found + size (color)) + ); + } + else + { + line = sformat ("%1%3", substring (line, 0, found), name, substring (line, found + size (color)) - ); + ); + } colored = true; if (name == "red" || name == "yellow") problem = true; @@ -218,6 +229,8 @@ Progress::NextStage(); + textmode = UI::GetDisplayInfo()["TextMode"]:false; + CheckLXCConfiguration (); Progress::NextStage(); @@ -231,8 +244,6 @@ map security = Security::Export (); method = tolower (security["PASSWD_ENCRYPTION"]:"des"); - textmode = UI::GetDisplayInfo()["TextMode"]:false; - Progress::NextStage(); return true; 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 27 13:33:33 2012 @@ -123,7 +123,7 @@ `HSpacing (0.5), `VBox ( `HBox ( // text entry label - `TextEntry (`id (`ip), _("IP Address")), + `TextEntry (`id (`ip), _("IP Address"), "0.0.0.0"), `HSpacing (), // text entry label `TextEntry (`id (`subnet), _("Subnet"), "/24"), Modified: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Fri Apr 27 13:33:33 2012 @@ -55,9 +55,15 @@ "create" : _("<big>Creating New Container</big>") + // Create dialog help, part 2 -_("Choose a Name, Template and enter network settings for the new container. If there's no bridge device configured yet, use Configure Network button and create one. Select a root password to use in the container.") + +_("Choose a Name, Template and enter network settings for the new container.") + // Create dialog help, part 3 +_("Use the value <tt>0.0.0.0</tt> as IP Address to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use Configure Network button and create one.") + + + // Create dialog help, part 4 +_("Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.") + + + // Create dialog help, part 5 _("Use Create to start the creation process.") -- 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] r68032 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes yast2-qt-pkg.spec.in
by tgoettlicher＠svn2.opensuse.org 27 Apr '12

27 Apr '12

Author: tgoettlicher Date: Fri Apr 27 10:55:14 2012 New Revision: 68032 URL: http://svn.opensuse.org/viewcvs/yast?rev=68032&view=rev Log: gcc47 fix Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=68032&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Apr 27 10:55:14 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "23") +SET(VERSION_PATCH "24") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Apr 27 10:55:14 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 27 10:54:25 CEST 2012 - tgoettlicher(a)suse.de + +- Workaround for gcc 4.7 issues +- 2.21.24 + +------------------------------------------------------------------- Thu Apr 26 11:03:07 CEST 2012 - tgoettlicher(a)suse.de - Added package group for unneeded packages Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Apr 27 10:55:14 2012 @@ -14,6 +14,12 @@ BuildRequires: yast2-qt-devel >= 2.20.0 BuildRequires: libzypp-devel >= 11.4.0 BuildRequires: yast2-libyui-devel >= 2.20.0 +%if 0%{?force_gcc_46} +BuildRequires: gcc46 +BuildRequires: gcc46-c++ +%else +BuildRequires: gcc-c++ >= 4.6 +%endif Requires: libzypp >= 11.4.0 Requires: yast2-libyui >= 2.20.0 Requires: yast2_theme >= 2.16.1 @@ -31,6 +37,10 @@ %build mkdir build cd build +%if 0%{?force_gcc_46} +export CC=gcc-4.6 +export CXX=g++-4.6 +%endif export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$CFLAGS" cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -- 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] r68031 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp IscsiServerFunctions.pm dialogs.ycp widgets.ycp
by fehr＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: fehr Date: Thu Apr 26 17:55:42 2012 New Revision: 68031 URL: http://svn.opensuse.org/viewcvs/yast?rev=68031&view=rev Log: checkin for backup purposes Removed: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiServerFunctions.pm Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Thu Apr 26 17:55:42 2012 @@ -250,7 +250,7 @@ global void SetIetdAuth( string tgt, integer tpg, list<string> incom, string outgo ) { map<string,any> m = GetTgt(data,tgt,tpg); - foreach( string s, incom, ``{m=AddIncoming( m, s );}); + foreach( string s, incom, {m=AddIncoming( m, s );}); if( !isempty(outgo) ) m = AddOutgoing( m, outgo ); SetTgt(data,tgt,tpg,m); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/dialogs.ycp Thu Apr 26 17:55:42 2012 @@ -223,13 +223,6 @@ "services" : [ "service:iscsitarget" ], "display_details" : true, ]), - "save" : $[ - "widget" : `push_button, - "label" : Label::SaveButton(), - "handle" : saveConfiguration, - "opt": [], - "help": HELPS["save_configuration"]:"" - ], "isns" : $[ "widget" : `custom, "custom_widget" : Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Thu Apr 26 17:55:42 2012 @@ -24,7 +24,6 @@ { textdomain "iscsi-lio-server"; -import "IscsiServerFunctions"; import "IscsiLioData"; import "Label"; import "Event"; @@ -638,30 +637,6 @@ } -symbol saveConfiguration(string key, map event) - { - y2milestone( "saveConfiguration key:%1 event:%2", key, event ); - if( is(event["ID"]:nil, string) && event["ID"]:"" == "save") - { - any filename = UI::AskForSaveFileName("/", "*", _("Save as...")); - if ( filename != nil && (string)filename!="") - { - if( IscsiServerFunctions::SaveIntoFile( (string)filename )) - { - Popup::Message(sformat(_("File %1 was saved successfully."), filename)); - list pathComponents = splitstring( (string)filename, "/"); - integer s = size(pathComponents) - 1; - string base = pathComponents[s]:"default"; - } - else - { - Popup::Warning(_("An error occurred while saving the file.")); - } - } - } - return nil; - } - list<term> RemoveById( list<term> it, any id ) { y2milestone( "RemoveById id:%1 item:%2", id, filter( term i, it, ``(i[0,0]:(any)99==id)) ); @@ -679,7 +654,7 @@ // dialog with targets // initialize target dialog -void initTable (string key) ``{ +void initTable (string key) { integer count = 0; list <term> inc_items = []; // create items from targets @@ -750,13 +725,9 @@ return ret; } -void initiSNS (string key) ``{ +void initiSNS (string key) { boolean ac=false; string ip = ""; -foreach(map<string, any> row, IscsiServerFunctions::getConfig()["iSNS"]:[], { - if(row["KEY"]:""=="iSNSAccessControl") ac=(row["VALUE"]:"No"=="Yes") ? true : false; - if(row["KEY"]:""=="iSNSServer") ip=row["VALUE"]:""; -}); UI::ChangeWidget(`isns_ac, `Value, ac); UI::ChangeWidget(`isns_ip, `Value, ip); } @@ -778,7 +749,6 @@ } string ac=((boolean)UI::QueryWidget(`isns_ac, `Value))?"Yes":"No"; if (ip=="") ac=""; - IscsiServerFunctions::setiSNS(ip, ac); } // **************** Edit Dialog ***************************** @@ -1242,7 +1212,7 @@ boolean chg = false; list<string> cl = IscsiLioData::GetClntList( curr_target, curr_tpg ); foreach( string c, del_clnt, - ``{ + { if( contains( cl, c )) { chg = 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] r68030 - in /branches/SuSE-Code-11-SP2-Branch/lxc: VERSION package/yast2-lxc.changes src/Makefile.am src/dialogs.ycp src/helps.ycp src/wizards.ycp
by jsuchome＠svn2.opensuse.org 26 Apr '12

26 Apr '12

Author: jsuchome Date: Thu Apr 26 16:24:02 2012 New Revision: 68030 URL: http://svn.opensuse.org/viewcvs/yast?rev=68030&view=rev Log: - check if configuration is prepared - updated help texts - 2.17.4 Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (with props) 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/Makefile.am branches/SuSE-Code-11-SP2-Branch/lxc/src/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.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 Thu Apr 26 16:24:02 2012 @@ -1 +1 @@ -2.17.3 +2.17.4 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 Thu Apr 26 16:24:02 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 26 16:06:25 CEST 2012 - jsuchome(a)suse.cz + +- check if configuration is prepared +- updated help texts +- 2.17.4 + +------------------------------------------------------------------- Mon Apr 23 16:42:59 CEST 2012 - jsuchome(a)suse.cz - handle more consoles running 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 Thu Apr 26 16:24:02 2012 @@ -6,6 +6,7 @@ lxc.ycp ynclude_DATA = \ + helps.ycp \ wizards.ycp \ 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 Thu Apr 26 16:24:02 2012 @@ -40,6 +40,8 @@ import "Security"; import "Wizard"; +include "lxc/helps.ycp"; + // PIDs of running consoles (indexed by lxc names) map<string,integer> console_pids = $[]; @@ -156,9 +158,7 @@ `VSpacing () ), `HSpacing ()); - string help_text = ""; - - Wizard::SetContentsButtons(caption, contents, help_text, + Wizard::SetContentsButtons(caption, contents, HELPS["create"]:"", // button label Label::CancelButton(), _("Create")); @@ -464,7 +464,7 @@ `VSpacing () ), `HSpacing ()); - Wizard::SetContentsButtons(caption, contents, "overview", + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", Label::BackButton(), Label::FinishButton()); update_table (); Added: branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/lxc/s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/helps.ycp Thu Apr 26 16:24:02 2012 @@ -0,0 +1,67 @@ +/* ------------------------------------------------------------------------------ + * 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/helps.ycp + * Package: Configuration of lxc + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "lxc"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help */ + "read" : _("<big>Initializing LXC Configuration</big> +Please wait... +"), + + // Overview dialog help, part 1 + "overview" : _("<big>LXC Overview</big> +Here, see the list of configured Linux Containers (LXC) with their current status. +Use Create to create new container. Delete existing one with Destroy. +") + + + // Overview dialog help, part 2 +_("You can start selected container with Start. The container is started in background. You can connect to it using Connect button or manually using <tt>lxc-console</tt> command. Once in console, you can close it from within or using the Disconnect button. +Note that Connect option is not available in text mode."), + + // Create dialog help, part 1 + "create" : _("<big>Creating New Container</big>") + + + // Create dialog help, part 2 +_("Choose a Name, Template and enter network settings for the new container. If there's no bridge device configured yet, use Configure Network button and create one. Select a root password to use in the container.") + + + // Create dialog help, part 3 +_("Use Create to start the creation process.") + + +]; + +/* EOF */ +} Modified: 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 (original) +++ branches/SuSE-Code-11-SP2-Branch/lxc/src/wizards.ycp Thu Apr 26 16:24:02 2012 @@ -43,6 +43,7 @@ * @return `abort if aborted and `next otherwise */ symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); if (!Confirm::MustBeRoot()) return `abort; boolean ret = Lxc::Read(); return ret ? `next : `abort; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0