Add patch to fix bootorder (rhbz#1263612).
This commit is contained in:
parent
8fb61d8dfb
commit
d508972500
22
lxc-1.1.4-fix-bootorder.patch
Normal file
22
lxc-1.1.4-fix-bootorder.patch
Normal file
@ -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]
|
8
lxc.spec
8
lxc.spec
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
Name: lxc
|
Name: lxc
|
||||||
Version: 1.1.4
|
Version: 1.1.4
|
||||||
Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
|
Release: %{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
|
||||||
Summary: Linux Resource Containers
|
Summary: Linux Resource Containers
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: LGPLv2+ and GPLv2
|
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
|
Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
|
||||||
%endif
|
%endif
|
||||||
Patch0: lxc-1.1.0-fix-init.patch
|
Patch0: lxc-1.1.0-fix-init.patch
|
||||||
|
Patch1: lxc-1.1.4-fix-bootorder.patch
|
||||||
BuildRequires: docbook-utils
|
BuildRequires: docbook-utils
|
||||||
BuildRequires: docbook2X
|
BuildRequires: docbook2X
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -181,6 +182,8 @@ This package contains documentation for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}}
|
%setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
# see rhbz#1263612
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -379,6 +382,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 21 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.1.4-2
|
||||||
|
- Add patch to fix bootorder (rhbz#1263612).
|
||||||
|
|
||||||
* Sat Oct 17 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.1.4-1
|
* Sat Oct 17 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.1.4-1
|
||||||
- Update to 1.1.4.
|
- Update to 1.1.4.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user