diff --git a/lxc-1.1.4-fix-bootorder.patch b/lxc-1.1.4-fix-bootorder.patch new file mode 100644 index 0000000..8a8bb8c --- /dev/null +++ b/lxc-1.1.4-fix-bootorder.patch @@ -0,0 +1,22 @@ +diff -up lxc-1.1.4/config/init/systemd/lxc-net.service.in.orig lxc-1.1.4/config/init/systemd/lxc-net.service.in +--- lxc-1.1.4/config/init/systemd/lxc-net.service.in.orig 2015-10-06 16:18:16.000000000 +0200 ++++ lxc-1.1.4/config/init/systemd/lxc-net.service.in 2015-10-21 16:34:06.283178668 +0200 +@@ -1,6 +1,6 @@ + [Unit] + Description=LXC network bridge setup +-After=network.target ++After=network-online.target + Before=lxc.service + + [Service] +diff -up lxc-1.1.4/config/init/systemd/lxc.service.in.orig lxc-1.1.4/config/init/systemd/lxc.service.in +--- lxc-1.1.4/config/init/systemd/lxc.service.in.orig 2015-10-06 16:18:16.000000000 +0200 ++++ lxc-1.1.4/config/init/systemd/lxc.service.in 2015-10-21 16:33:41.193477243 +0200 +@@ -1,6 +1,6 @@ + [Unit] + Description=LXC Container Initialization and Autoboot Code +-After=syslog.target network.target lxc-net.service ++After=syslog.target network-online.target lxc-net.service + Wants=lxc-net.service + + [Service] diff --git a/lxc.spec b/lxc.spec index 832b4e9..c52ed11 100644 --- a/lxc.spec +++ b/lxc.spec @@ -31,7 +31,7 @@ Name: lxc Version: 1.1.4 -Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} +Release: %{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist} Summary: Linux Resource Containers Group: Applications/System License: LGPLv2+ and GPLv2 @@ -42,6 +42,7 @@ Source0: https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.t Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz %endif Patch0: lxc-1.1.0-fix-init.patch +Patch1: lxc-1.1.4-fix-bootorder.patch BuildRequires: docbook-utils BuildRequires: docbook2X BuildRequires: doxygen @@ -181,6 +182,8 @@ This package contains documentation for %{name}. %prep %setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}} %patch0 -p1 +# see rhbz#1263612 +%patch1 -p1 %build @@ -379,6 +382,9 @@ fi %changelog +* Wed Oct 21 2015 Thomas Moschny - 1.1.4-2 +- Add patch to fix bootorder (rhbz#1263612). + * Sat Oct 17 2015 Thomas Moschny - 1.1.4-1 - Update to 1.1.4.