Update to 4.0.5.
This commit is contained in:
Thomas Moschny
parent
cd04e729d2
commit
81caaeb2ae
@ -1,11 +0,0 @@
|
||||
diff -up lxc-2.0.6/config/init/systemd/lxc-net.service.in.orig lxc-2.0.6/config/init/systemd/lxc-net.service.in
|
||||
--- lxc-2.0.6/config/init/systemd/lxc-net.service.in.orig 2016-11-23 20:15:59.000000000 +0100
|
||||
+++ lxc-2.0.6/config/init/systemd/lxc-net.service.in 2016-12-04 21:55:24.149093437 +0100
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=LXC network bridge setup
|
||||
After=network-online.target
|
||||
+Wants=network-online.target
|
||||
Before=lxc.service
|
||||
|
||||
[Service]
|
||||
@ -1,34 +0,0 @@
|
||||
From b31d62b847a3ee013613795094cce4acc12345ef Mon Sep 17 00:00:00 2001
|
||||
From: Christian Brauner <christian.brauner@ubuntu.com>
|
||||
Date: Sun, 28 Jul 2019 23:13:26 +0200
|
||||
Subject: [PATCH] cgroups: initialize cpuset properly
|
||||
|
||||
Closes #3108.
|
||||
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
|
||||
---
|
||||
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 7b8fe6736f..c29c0958e9 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;
|
||||
|
||||
11
lxc-4.0.1-fix-lxc-net.patch
Normal file
11
lxc-4.0.1-fix-lxc-net.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -up lxc-4.0.1/config/init/systemd/lxc-net.service.in.orig lxc-4.0.1/config/init/systemd/lxc-net.service.in
|
||||
--- lxc-4.0.1/config/init/systemd/lxc-net.service.in.orig 2020-04-06 21:15:17.000000000 +0200
|
||||
+++ lxc-4.0.1/config/init/systemd/lxc-net.service.in 2020-04-10 18:31:54.277490764 +0200
|
||||
@@ -1,6 +1,7 @@
|
||||
[Unit]
|
||||
Description=LXC network bridge setup
|
||||
After=network-online.target
|
||||
+Wants=network-online.target
|
||||
Before=lxc.service
|
||||
Documentation=man:lxc
|
||||
|
||||
36
lxc.spec
36
lxc.spec
@ -10,15 +10,15 @@
|
||||
%endif
|
||||
|
||||
Name: lxc
|
||||
Version: 3.2.1
|
||||
Release: 4%{?dist}
|
||||
Version: 4.0.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Linux Resource Containers
|
||||
License: LGPLv2+ and GPLv2
|
||||
URL: http://linuxcontainers.org/lxc
|
||||
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
|
||||
Source1: lxc-net
|
||||
Patch0: lxc-2.0.7-fix-init.patch
|
||||
Patch1: lxc-2.0.6-fix-lxc-net.patch
|
||||
Patch2: lxc-3.2.1-cgroups-fix-cpuset-init.patch
|
||||
Patch1: lxc-4.0.1-fix-lxc-net.patch
|
||||
BuildRequires: docbook2X
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: kernel-headers
|
||||
@ -71,14 +71,17 @@ The %{name}-libs package contains libraries for running %{name} applications.
|
||||
%package templates
|
||||
Summary: Templates for %{name}
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
# Note: Requirements for the template scripts (busybox, dpkg,
|
||||
# Note: Not all requirements for the template scripts (busybox, dpkg,
|
||||
# debootstrap, rsync, openssh-server, dhclient, apt, pacman, zypper,
|
||||
# ubuntu-cloudimg-query etc...) are not explicitly mentioned here:
|
||||
# their presence varies wildly on supported Fedora/EPEL releases and
|
||||
# archs, and they are in most cases needed for a single template
|
||||
# only. Also, the templates normally fail graciously when such a tool
|
||||
# is missing. Moving each template to its own subpackage on the other
|
||||
# ubuntu-cloudimg-query etc...) are explicitly mentioned here: their
|
||||
# presence varies wildly on supported Fedora/EPEL releases and archs,
|
||||
# and they are in most cases needed for a single template only. Also,
|
||||
# the templates normally fail graciously when such a tool is
|
||||
# missing. Moving each template to its own subpackage on the other
|
||||
# hand would be overkill.
|
||||
#
|
||||
# Add wget, used by the 'download' template (see also #1828032)
|
||||
Requires: wget
|
||||
|
||||
|
||||
%description templates
|
||||
@ -152,6 +155,8 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name}
|
||||
# remove libtool .la file
|
||||
rm -rf %{buildroot}%{_libdir}/liblxc.la
|
||||
|
||||
# lxc-net config file
|
||||
cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-net
|
||||
|
||||
%check
|
||||
make check
|
||||
@ -161,20 +166,17 @@ make check
|
||||
%{?ldconfig}
|
||||
%systemd_post %{name}-net.service
|
||||
%systemd_post %{name}.service
|
||||
%systemd_post %{name}@.service
|
||||
|
||||
|
||||
%preun libs
|
||||
%systemd_preun %{name}-net.service
|
||||
%systemd_preun %{name}.service
|
||||
%systemd_preun %{name}@.service
|
||||
|
||||
|
||||
%postun libs
|
||||
%{?ldconfig}
|
||||
%systemd_postun %{name}-net.service
|
||||
%systemd_postun %{name}.service
|
||||
%systemd_postun %{name}@.service
|
||||
|
||||
|
||||
%files
|
||||
@ -213,6 +215,7 @@ make check
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/default.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-net
|
||||
%{_mandir}/man1/%{name}-autostart*
|
||||
%{_mandir}/*/man1/%{name}-autostart*
|
||||
%{_mandir}/man1/%{name}-user-nic*
|
||||
@ -221,6 +224,8 @@ make check
|
||||
%{_mandir}/man7/%{name}*
|
||||
%{_mandir}/*/man5/%{name}*
|
||||
%{_mandir}/*/man7/%{name}*
|
||||
%{_mandir}/man8/pam_cgfs*
|
||||
%{_mandir}/*/man8/pam_cgfs*
|
||||
%dir %{_pkgdocdir}
|
||||
%{_pkgdocdir}/AUTHORS
|
||||
%{_pkgdocdir}/README
|
||||
@ -252,6 +257,11 @@ make check
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Nov 14 2020 Thomas Moschny <thomas.moschny@gmx.de> - 4.0.5-1
|
||||
- Update to 4.0.5.
|
||||
- Enable LXC bridge per default.
|
||||
- Add wget dependency for the templates subpackage.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (lxc-3.2.1.tar.gz) = 4b3046fc6c4aa497fb26bd45839e60de503184af86d3966e796d14e619203536b9a9ed67bdcd8a108cf1a548f8d095fb46dff53094a08abd8d268c866db685c0
|
||||
SHA512 (lxc-4.0.5.tar.gz) = d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user