packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lxc: remove unused patchs

Browse Source 
Signed-off-by: LiFeng <lifeng68@huawei.com>
This commit is contained in:
LiFeng 2020-01-08 23:37:28 -05:00
parent bce6f5a9b7
commit e6ca6a4875
3 changed files with 2 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lxc-2.0.6-fix-lxc-net.patch
View File

@ -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]

46
lxc-2.0.7-fix-init.patch
View File

@ -1,46 +0,0 @@
diff -up lxc-2.0.7/config/init/sysvinit/lxc-containers.in.orig lxc-2.0.7/config/init/sysvinit/lxc-containers.in
--- lxc-2.0.7/config/init/sysvinit/lxc-containers.in.orig 2017-01-23 18:45:30.000000000 +0100
+++ lxc-2.0.7/config/init/sysvinit/lxc-containers.in 2017-01-29 13:00:23.934781187 +0100
@@ -2,7 +2,7 @@
#
# lxc Start/Stop LXC autoboot containers
#
-# chkconfig: 345 99 01
+# chkconfig: - 99 01
# description: Starts/Stops all LXC containers configured for autostart.
#
### BEGIN INIT INFO
@@ -11,8 +11,8 @@
# Required-Stop: $syslog $remote_fs
# Should-Start: cgroupfs-mount
# Should-Stop: cgroupfs-mount
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
# Short-Description: Bring up/down LXC autostart containers
# Description: Bring up/down LXC autostart containers
### END INIT INFO
diff -up lxc-2.0.7/config/init/sysvinit/lxc-net.in.orig lxc-2.0.7/config/init/sysvinit/lxc-net.in
--- lxc-2.0.7/config/init/sysvinit/lxc-net.in.orig 2017-01-23 18:45:30.000000000 +0100
+++ lxc-2.0.7/config/init/sysvinit/lxc-net.in 2017-01-29 13:00:23.935781166 +0100
@@ -2,7 +2,7 @@
#
# lxc-net Start/Stop LXC Networking
#
-# chkconfig: 345 98 01
+# chkconfig: - 98 01
# description: Starts/Stops LXC Network Bridge
#
### BEGIN INIT INFO
@@ -11,8 +11,8 @@
# Required-Stop: $syslog $remote_fs
# Should-Start:
# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
# Short-Description: Bring up/down LXC Network Bridge
# Description: Bring up/down LXC Network Bridge
### END INIT INFO

6
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 20200106
%global _release 20200109
%global debug_package %{nil}
Name: lxc
@ -8,9 +8,7 @@ Summary: Linux Containers userspace tools
License: LGPLv2+
URL: http://linuxcontainers.org
Source0: http://linuxcontainers.org/downloads/lxc-3.0.3.tar.gz
Patch6000: lxc-2.0.7-fix-init.patch
Patch6001: lxc-2.0.6-fix-lxc-net.patch
Patch6002: lxc-CVE-2019-5736-runC-rexec-callers-as-memfd.patch
Patch6000: lxc-CVE-2019-5736-runC-rexec-callers-as-memfd.patch
Patch9003: 0001-confile-add-lxc.isulad.init.args-config-interface.patch
Patch9004: 0002-namespace-add-support-share-namespace-by-path.patch
Patch9005: 0003-confile-add-lxc.isulad.populate.device-interface.patch