Hello community,

here is the log from the commit of package lxc for openSUSE:Leap:15.2 checked 
in at 2020-02-09 11:24:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/lxc (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.lxc.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lxc"

Sun Feb  9 11:24:54 2020 rev:17 rq:769654 version:3.2.1

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/lxc/lxc.changes        2020-01-15 
15:27:52.118658604 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.lxc.new.26092/lxc.changes     2020-02-09 
11:25:00.711285051 +0100
@@ -1,0 +2,19 @@
+Mon Feb  3 14:54:13 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to
+  shortcut through the -mini flavors.
+
+-------------------------------------------------------------------
+Sun Feb  2 12:48:21 UTC 2020 - Aleksa Sarai <[email protected]>
+
+- Fix bash-completion paths to match the binary names (and to avoid conflicts
+  with LXD). boo#1162426
+
+-------------------------------------------------------------------
+Mon Nov 11 23:26:49 UTC 2019 - Pavol Cupka <[email protected]>
+
+- adding a patch to fix "Containers fail to start regression lxc 3.2"
+  - patch name: lxc-3.2.1-cgroups-init-cpuset-properly.patch
+  - upstream issue - https://github.com/lxc/lxc/issues/3108
+
+-------------------------------------------------------------------

New:
----
  lxc-3.2.1-cgroups-init-cpuset-properly.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lxc.spec ++++++
--- /var/tmp/diff_new_pack.rdkwOX/_old  2020-02-09 11:25:01.167285311 +0100
+++ /var/tmp/diff_new_pack.rdkwOX/_new  2020-02-09 11:25:01.167285311 +0100
@@ -48,6 +48,7 @@
 Source91:       missing_setuid.txt.in
 # FIX-UPSTREAM: Backport of https://github.com/lxc/lxc/pull/3102.
 Patch1:         0001-tree-wide-initialize-all-auto-cleanup-variables.patch
+Patch2:         lxc-3.2.1-cgroups-init-cpuset-properly.patch
 BuildRequires:  gcc
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -65,12 +66,12 @@
 BuildRequires:  docbook-utils
 BuildRequires:  docbook2x
 BuildRequires:  bash-completion
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 Requires:       libcap-progs
 Requires:       lxcfs
 Requires:       lxcfs-hooks-lxc
 Requires:       rsync
-%{?systemd_requires}
+%{?systemd_ordering}
 # Needed to create openSUSE containers using template.
 Recommends:     build
 Recommends:     criu >= 2.0
@@ -131,6 +132,7 @@
 %setup
 # Fix -Werror=maybe-uninitialized build errors.
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./autogen.sh
@@ -177,10 +179,15 @@
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-net
 
-# Ensure we install the bash-completion to the correct place -- on some SLE
-# versions this is done for us by make_install, on others we need to do it
-# manually.
-install -D -m 0644 config/bash/lxc 
%{buildroot}%{_datadir}/bash-completion/completions/%{name}
+# Install bash-completion. Note that we have to install a symlink for every
+# lxc-* command because bash-completion relies on the binary name to pick the
+# bash-completion script.
+install -D -m 0644 config/bash/lxc 
%{buildroot}%{_datadir}/bash-completion/completions/_%{name}
+for bin in $(find src/lxc/lxc-* -executable -print0 | xargs -n1 -0 basename)
+do
+       ln -s "_%{name}" 
"%{buildroot}%{_datadir}/bash-completion/completions/$bin"
+done
+# lxc installs bash-completion to the wrong location.
 rm -f %{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
 
 # Clean up.

++++++ lxc-3.2.1-cgroups-init-cpuset-properly.patch ++++++
>From b31d62b847a3ee013613795094cce4acc12345ef Mon Sep 17 00:00:00 2001
From: Christian Brauner <[email protected]>
Date: Sun, 28 Jul 2019 23:13:26 +0200
Subject: [PATCH] cgroups: initialize cpuset properly

Closes #3108.
Signed-off-by: Christian Brauner <[email protected]>
---
 src/lxc/cgroups/cgfsng.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 7b8fe6736..c29c0958e 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, 
bool am_initialized)
        }
 
        if (!flipped_bit) {
-               DEBUG("No isolated or offline cpus present in cpuset");
-               return true;
+               cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
+               TRACE("No isolated or offline cpus present in cpuset");
+       } else {
+               cpulist = move_ptr(posscpus);
+               TRACE("Removed isolated or offline cpus from cpuset");
        }
-       DEBUG("Removed isolated or offline cpus from cpuset");
-
-       cpulist = lxc_cpumask_to_cpulist(possmask, maxposs);
        if (!cpulist) {
                ERROR("Failed to create cpu list");
                return false;
-- 
2.22.0




Reply via email to