Hello community, here is the log from the commit of package yast2-lxc for openSUSE:Factory checked in at 2012-08-27 17:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-lxc (Old) and /work/SRC/openSUSE:Factory/.yast2-lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-lxc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-lxc/yast2-lxc.changes 2012-05-10 14:35:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-lxc.new/yast2-lxc.changes 2012-08-27 17:48:35.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 20 15:57:38 CEST 2012 - [email protected] + +- do not show wwarning when only "File capabilities" are missing + and module is run as root (bnc#776172) +- 2.22.2 + +------------------------------------------------------------------- Old: ---- yast2-lxc-2.22.1.tar.bz2 New: ---- yast2-lxc-2.22.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-lxc.spec ++++++ --- /var/tmp/diff_new_pack.dhQMDL/_old 2012-08-27 17:48:40.000000000 +0200 +++ /var/tmp/diff_new_pack.dhQMDL/_new 2012-08-27 17:48:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-lxc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,27 @@ Name: yast2-lxc -Version: 2.22.1 +Version: 2.22.2 Release: 0 -License: GPL-2.0 -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-lxc-%{version}.tar.bz2 +Requires: lxc +Requires: yast2 +Requires: yast2-security +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-devtools +BuildRequires: yast2-security +BuildRequires: yast2-testsuite -Requires: yast2 yast2-security lxc -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-security - -BuildArchitectures: noarch +BuildArch: noarch Summary: Management tool for Linux Containers (LXC) +License: GPL-2.0 +Group: System/YaST %description Graphical management tool for Linux Containers (LXC) @@ -60,7 +66,6 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done - %clean rm -rf "$RPM_BUILD_ROOT" @@ -72,3 +77,5 @@ /usr/share/YaST2/modules/Lxc.* %{_prefix}/share/applications/YaST2/lxc.desktop %doc %{_prefix}/share/doc/packages/yast2-lxc + +%changelog ++++++ yast2-lxc-2.22.1.tar.bz2 -> yast2-lxc-2.22.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/VERSION new/yast2-lxc-2.22.2/VERSION --- old/yast2-lxc-2.22.1/VERSION 2012-04-30 13:48:10.000000000 +0200 +++ new/yast2-lxc-2.22.2/VERSION 2012-08-20 15:58:10.000000000 +0200 @@ -1 +1 @@ -2.22.1 +2.22.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/src/Lxc.ycp new/yast2-lxc-2.22.2/src/Lxc.ycp --- old/yast2-lxc-2.22.1/src/Lxc.ycp 2012-04-30 13:53:29.000000000 +0200 +++ new/yast2-lxc-2.22.2/src/Lxc.ycp 2012-08-21 15:44:56.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Lxc settings, input and output functions * Authors: Jiri Suchomel <[email protected]> * - * $Id: Lxc.ycp 68050 2012-04-30 11:53:28Z jsuchome $ + * $Id$ * * Representation of the configuration of lxc. * Input and output routines. @@ -39,6 +39,7 @@ import "FileUtils"; import "Progress"; import "Security"; +import "String"; // text or graphic mode? @@ -127,13 +128,17 @@ boolean CheckLXCConfiguration () { boolean problem = false; + + map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/id --user"); + boolean root = out["stdout"]:"" == "0\n"; + // 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)); + "cp /proc/config.gz '%1/' && gunzip '%1/config.gz'", String::Quote (tmpdir))); - map out = (map) SCR::Execute (.target.bash_output, sformat ( - "GREP=grep CONFIG=%1/config /usr/bin/lxc-checkconfig", tmpdir)); + out = (map) SCR::Execute (.target.bash_output, sformat ( + "LANG=C GREP=grep CONFIG='%1/config' /usr/bin/lxc-checkconfig", String::Quote (tmpdir))); list<string> rt = []; map<string,string> colors = $[ @@ -168,7 +173,17 @@ } colored = true; if (name == "red" || name == "yellow") - problem = true; + { + // When running as root, "File capabilities" warning is not relevant (bnc#776172) + if (root && issubstring (line, "File capabilities")) + { + y2milestone ("File capabilities not met. Ignoring the warning for root user."); + } + else + { + problem = true; + } + } } }); // 'normalizing' color diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/src/dialogs.ycp new/yast2-lxc-2.22.2/src/dialogs.ycp --- old/yast2-lxc-2.22.1/src/dialogs.ycp 2012-04-30 13:53:29.000000000 +0200 +++ new/yast2-lxc-2.22.2/src/dialogs.ycp 2012-08-20 11:01:39.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <[email protected]> * - * $Id: dialogs.ycp 68050 2012-04-30 11:53:28Z jsuchome $ + * $Id$ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/src/helps.ycp new/yast2-lxc-2.22.2/src/helps.ycp --- old/yast2-lxc-2.22.1/src/helps.ycp 2012-04-30 13:53:29.000000000 +0200 +++ new/yast2-lxc-2.22.2/src/helps.ycp 2012-08-20 11:01:39.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Suchomel <[email protected]> * - * $Id: helps.ycp 68050 2012-04-30 11:53:28Z jsuchome $ + * $Id$ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/src/lxc.ycp new/yast2-lxc-2.22.2/src/lxc.ycp --- old/yast2-lxc-2.22.1/src/lxc.ycp 2012-04-30 13:47:28.000000000 +0200 +++ new/yast2-lxc-2.22.2/src/lxc.ycp 2012-08-20 11:01:39.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <[email protected]> * - * $Id: lxc.ycp 67977 2012-04-20 15:28:41Z jsuchome $ + * $Id$ * * Main file for lxc configuration. Uses all other files. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-lxc-2.22.1/src/wizards.ycp new/yast2-lxc-2.22.2/src/wizards.ycp --- old/yast2-lxc-2.22.1/src/wizards.ycp 2012-04-30 13:53:29.000000000 +0200 +++ new/yast2-lxc-2.22.2/src/wizards.ycp 2012-08-20 11:01:39.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Wizards definitions * Authors: Jiri Suchomel <[email protected]> * - * $Id: wizards.ycp 68050 2012-04-30 11:53:28Z jsuchome $ + * $Id$ */ { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
