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/VERSION?rev=68033&r1=68032&r2=68033&view=diff
==============================================================================
--- 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/package/yast2-lxc.changes?rev=68033&r1=68032&r2=68033&view=diff
==============================================================================
--- 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@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@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/src/Lxc.ycp?rev=68033&r1=68032&r2=68033&view=diff
==============================================================================
--- 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 colors = $[
@@ -142,11 +143,21 @@
integer found = find (line, color);
if (found != nil && found > 0)
{
- line = sformat ("%1<font color=%2>%3</font>",
+ if (textmode)
+ {
+ line = sformat ("%1<i>%2</i>",
+ substring (line, 0, found),
+ substring (line, found + size (color))
+ );
+ }
+ else
+ {
+ line = sformat ("%1<font color=%2>%3</font>",
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/src/dialogs.ycp?rev=68033&r1=68032&r2=68033&view=diff
==============================================================================
--- 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/src/helps.ycp?rev=68033&r1=68032&r2=68033&view=diff
==============================================================================
--- 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" : _("<p><b><big>Creating New Container</big></b></p>") +
// Create dialog help, part 2
-_("<p>Choose a <b>Name</b>, <b>Template</b> and enter network settings for the new container. If there's no bridge device configured yet, use <b>Configure Network</b> button and create one. Select a root password to use in the container.</p>") +
+_("<p>Choose a <b>Name</b>, <b>Template</b> and enter network settings for the new container.</p>") +
// Create dialog help, part 3
+_("<p>Use the value <tt>0.0.0.0</tt> as <b>IP Address</b> to have dynamic address assigned by DHCP. If there's no bridge device configured yet, use <b>Configure Network</b> button and create one.</p>") +
+
+ // Create dialog help, part 4
+_("<p>Select a root password to use in the container. If no password is entered, the default value <tt>root</tt> will be used.</p>") +
+
+ // Create dialog help, part 5
_("<p>Use <b>Create</b> to start the creation process.</p>")
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
