diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-15 06:09:43 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-24 11:52:08 +0000 |
commit | 70bb1b15269463164c06848aa6d46d623b1b333a (patch) | |
tree | 5d2d3dd49b5fdc3b4c8a6eae1ceab4bc252ac3db | |
parent | a5dd6518ebd25789f6dfdf1d1270d59cc362b633 (diff) | |
download | alpine_aports-70bb1b15269463164c06848aa6d46d623b1b333a.tar.bz2 alpine_aports-70bb1b15269463164c06848aa6d46d623b1b333a.tar.xz alpine_aports-70bb1b15269463164c06848aa6d46d623b1b333a.zip |
main/lxc: start service after networking and firewall
(cherry picked from commit 5793c8d73787b4e03ee0abcbbe95e55429b8b749)
Conflicts:
main/lxc/APKBUILD
-rw-r--r-- | main/lxc/APKBUILD | 8 | ||||
-rw-r--r-- | main/lxc/lxc.initd | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 408871eb4d..c34a5617d9 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=lxc | 3 | pkgname=lxc |
4 | pkgver=0.9.0 | 4 | pkgver=0.9.0 |
5 | _mypkgver=${pkgver/_rc/-rc} | 5 | _mypkgver=${pkgver/_rc/-rc} |
6 | pkgrel=2 | 6 | pkgrel=3 |
7 | pkgdesc="linux containers - tools" | 7 | pkgdesc="linux containers - tools" |
8 | url="http://lxc.sourceforge.net/" | 8 | url="http://lxc.sourceforge.net/" |
9 | arch="all" | 9 | arch="all" |
@@ -54,16 +54,16 @@ a0894c2ddf9133c3cc33c264e4596a3c bb-rm.patch | |||
54 | e96514860ee34b62d1b208ab03c569bc bb-shutdown.patch | 54 | e96514860ee34b62d1b208ab03c569bc bb-shutdown.patch |
55 | 25dd200bd158d16a05bb3e7aaef84697 alpine-template-backport.patch | 55 | 25dd200bd158d16a05bb3e7aaef84697 alpine-template-backport.patch |
56 | e08b77b3b35adac290b49b9c9e04754c 0001-lxc-alpine-create-dev-zero.patch | 56 | e08b77b3b35adac290b49b9c9e04754c 0001-lxc-alpine-create-dev-zero.patch |
57 | f3c6998798b13425b8d0647bad0834a8 lxc.initd" | 57 | 4d248c3d47317d7f770963f07fcc1473 lxc.initd" |
58 | sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz | 58 | sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz |
59 | c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc bb-rm.patch | 59 | c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc bb-rm.patch |
60 | 0e5706cb077f750afdd6a5a4fd2afdf0b9113126c85e130d92680bed4ce9c20e bb-shutdown.patch | 60 | 0e5706cb077f750afdd6a5a4fd2afdf0b9113126c85e130d92680bed4ce9c20e bb-shutdown.patch |
61 | df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b alpine-template-backport.patch | 61 | df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b alpine-template-backport.patch |
62 | 8b3b314d99209ae27d78cd4e9469638a945d68d03beefaec499bad373a7cb8cd 0001-lxc-alpine-create-dev-zero.patch | 62 | 8b3b314d99209ae27d78cd4e9469638a945d68d03beefaec499bad373a7cb8cd 0001-lxc-alpine-create-dev-zero.patch |
63 | 77c64e6137457be89c150b82d681a3eb5c7c1f06af142a321703fc9a43bff200 lxc.initd" | 63 | ec036b358ead871b03709cc9d3ebecafcc722be19808d4225029b7bd386726dd lxc.initd" |
64 | sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz | 64 | sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz |
65 | b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc221ac457db3bed4a199491059a15f66755deddc93ce91bf1 bb-rm.patch | 65 | b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc221ac457db3bed4a199491059a15f66755deddc93ce91bf1 bb-rm.patch |
66 | 86df52e380a01d6d3f588ca395925e8f774529c72e5b4c8dcb701d79fad7697ed8800f0ff51fded2896b2d2af49faa7f26960234fc8c1a6b4bc8f42d85078e6d bb-shutdown.patch | 66 | 86df52e380a01d6d3f588ca395925e8f774529c72e5b4c8dcb701d79fad7697ed8800f0ff51fded2896b2d2af49faa7f26960234fc8c1a6b4bc8f42d85078e6d bb-shutdown.patch |
67 | d10e25aeee0aba61a4c3420fe1b2bfd9213e7ef10f399ed5f0ba5d978a97a49fd23044b098f73f6d9651c23b1bb025f30d81deb6aec9edf4d2267afc22a09d60 alpine-template-backport.patch | 67 | d10e25aeee0aba61a4c3420fe1b2bfd9213e7ef10f399ed5f0ba5d978a97a49fd23044b098f73f6d9651c23b1bb025f30d81deb6aec9edf4d2267afc22a09d60 alpine-template-backport.patch |
68 | 0304aabfac3280cbc18347f1168b2289a98e03b9f6a3134770e43bb914978a64a108a0b0ec709856db161e98366c06c8a65d5a30e730add4cee2968718cdc93a 0001-lxc-alpine-create-dev-zero.patch | 68 | 0304aabfac3280cbc18347f1168b2289a98e03b9f6a3134770e43bb914978a64a108a0b0ec709856db161e98366c06c8a65d5a30e730add4cee2968718cdc93a 0001-lxc-alpine-create-dev-zero.patch |
69 | 4e56f7b869345f936df54c4359abdd3b8d0244c0fd71a9a787bc2393c4caabca22ca8417f16da47f02c86294750986fd674d0d2e7c1b1d096076873b22c07a29 lxc.initd" | 69 | 4712cf4f20c0fb6040a806fc7996f19953e96c56d90c43a1f4af2f9a5be8c7a76b16872fa6dad63d20152795413b73d8492d614f15e20ea3d6760fbbd6855e0f lxc.initd" |
diff --git a/main/lxc/lxc.initd b/main/lxc/lxc.initd index 4ece09f9a9..31bfbd44ca 100644 --- a/main/lxc/lxc.initd +++ b/main/lxc/lxc.initd | |||
@@ -10,6 +10,7 @@ extra_started_commands="reboot" | |||
10 | 10 | ||
11 | depend() { | 11 | depend() { |
12 | need localmount | 12 | need localmount |
13 | after firewall net | ||
13 | } | 14 | } |
14 | 15 | ||
15 | lxc_get_configfile() { | 16 | lxc_get_configfile() { |