- rediff patch, rel 2

diff --git a/lxc-net.patch b/lxc-net.patch
index a328d72f42ea926e82394486ea5a2004252c832b..bf1b00eaa6dfb0f147527392aec08037cfe141cd 100644 (file)
--- a/lxc-net.patch
+++ b/lxc-net.patch
@@ -1,7 +1,7 @@
-# diff -durN -x '*~' -x '*.orig' lxc-1.1.3.orig/config/init/common/lxc-net.in lxc-1.1.3/config/init/common/lxc-net.in  > ~/rpm/packages/lxc/lxc-net.patch
---- lxc-1.1.3.orig/config/init/common/lxc-net.in       2015-08-15 00:32:10.000000000 +0200
-+++ lxc-1.1.3/config/init/common/lxc-net.in    2015-09-14 13:43:35.950386724 +0200
-@@ -24,6 +24,17 @@
+diff -urNp -x '*.orig' lxc-4.0.8.org/config/init/common/lxc-net.in lxc-4.0.8/config/init/common/lxc-net.in
+--- lxc-4.0.8.org/config/init/common/lxc-net.in        2021-04-30 20:16:25.000000000 +0200
++++ lxc-4.0.8/config/init/common/lxc-net.in    2021-05-02 22:01:52.309594885 +0200
+@@ -26,6 +26,17 @@ LXC_IPV6_NAT="false"
  
  [ ! -f $distrosysconfdir/lxc ] || . $distrosysconfdir/lxc
  
@@ -19,8 +19,8 @@
  use_iptables_lock="-w"
  iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
  
-@@ -48,7 +59,9 @@
-     ip link set dev $1 up
+@@ -51,7 +62,9 @@ _ifup() {
+     ip link set dev ${LXC_BRIDGE} up
  }
  
 +
@@ -29,7 +29,7 @@
      [ "x$USE_LXC_BRIDGE" = "xtrue" ] || { exit 0; }
  
      [ ! -f "${varrun}/network_up" ] || { echo "lxc-net is already running"; exit 1; }
-@@ -131,6 +144,7 @@
+@@ -145,6 +158,7 @@ start() {
  }
  
  stop() {

diff --git a/lxc.spec b/lxc.spec
index 1768c7b4aa96d054c562fc5d0e93fc1daaeb5f45..ed07fd4f67208b8cb58024bc76fe9bca5f1aead6 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -14,7 +14,7 @@ Summary:      Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
 Version:       4.0.8
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz