diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2016-09-13 23:20:05 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-09-15 20:55:44 +0200 |
| commit | bea7246a8fbf0e2ab41909597edd00fdb36a7793 (patch) | |
| tree | 428010f00825b261787e917fa28efa5dee9ec84c | |
| parent | f78de62584abc5348ac3a31d84c4ad3adaf08004 (diff) | |
community/cgmanager: fix initd
cgmanager needs to be started before cgproxy
| -rw-r--r-- | community/cgmanager/APKBUILD | 14 | ||||
| -rw-r--r-- | community/cgmanager/cgmanager.initd | 2 | ||||
| -rw-r--r-- | community/cgmanager/cgproxy.initd | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/community/cgmanager/APKBUILD b/community/cgmanager/APKBUILD index d2c42e3a9c4..71d15f6c14f 100644 --- a/community/cgmanager/APKBUILD +++ b/community/cgmanager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=cgmanager pkgver=0.41 -pkgrel=1 +pkgrel=2 pkgdesc="nother daemon for managing control groups" url="https://linuxcontainers.org/cgmanager/" arch="all" @@ -44,11 +44,11 @@ package() { } md5sums="6ebed9ed3bf0751eb3cde47a94c45340 cgmanager-0.41.tar.gz -29ad96ec5a4ddfc6d9fb7b3df8e2375f cgmanager.initd -10ad15961c3921d92af342908730c2ee cgproxy.initd" +41adf1ade7d948b4a23e07cae542ee09 cgmanager.initd +f92c9952b1a744b109c35c3488c6d262 cgproxy.initd" sha256sums="29b155befb3ac233d5d29dbca7c791c8138bab01bfa78ea4757ebb88ce23b458 cgmanager-0.41.tar.gz -ce10491d71b1163e6a6b737dc65e1fae6b7d05b4bfaaa8a42c85c6c0e38fac66 cgmanager.initd -adb05f21ca89439f47c8e17283d4accb82860c44f7703807bc5142686a47ebf0 cgproxy.initd" +123826e2116fc9f07d9e11b2d27f9bff03313b44c98bf4a0c0c288689e9bb8ac cgmanager.initd +ad05950d2c4581067c90df0c47eacfc01ca2576db3c2ffac048f962f5222aa2f cgproxy.initd" sha512sums="e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd cgmanager-0.41.tar.gz -1a6de3d90140b0c8e0871ab097bb3260f35dd4ad5f131ead8913f6168e41eb43cac38ab4c09eb792bfffc982353c0976c9ee6568299dc803058c0dd4381aa675 cgmanager.initd -3e7ed48d3d5b4c178ec038b6db53d693f98ac9dd2b5ba405cc0241ddb2a0d60632bd1aeb7b7bea6ee3cf15a66eb069690197d067f9c7d8b5d8654f509db0f230 cgproxy.initd" +fe148a9891d5f5f101283a39df223712c7a8c6ec7e7caf85888a390eac639b918a0b8a9923af1b6a5c21aae8cf50ec3d1dd1656837f6f172cec2fce063a1c5e6 cgmanager.initd +b43439d9086fe50a8de93a61167272474e9e9b7a71b5a93bf3c6d2da127f95be3294c713295ca51c68e6de1f95c4d969502d8c3d503bc510873ccec794bef5ba cgproxy.initd" diff --git a/community/cgmanager/cgmanager.initd b/community/cgmanager/cgmanager.initd index 9088f9280ea..ac705cb7c0c 100644 --- a/community/cgmanager/cgmanager.initd +++ b/community/cgmanager/cgmanager.initd @@ -9,7 +9,7 @@ NESTED=yes OPTIONS= depend() { - after cgproxy + before cgproxy } start() { diff --git a/community/cgmanager/cgproxy.initd b/community/cgmanager/cgproxy.initd index 18bdbcd9a64..9a834debba7 100644 --- a/community/cgmanager/cgproxy.initd +++ b/community/cgmanager/cgproxy.initd @@ -9,7 +9,7 @@ NESTED=yes OPTIONS= depend() { - before cgmanager + need cgmanager } start() { @@ -21,7 +21,7 @@ start() { # cgproxy should only run on container unless on older kernel if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then eerror "Too old kernel to support cgroup, please update to >3.8" - return 1 + return 1 fi start-stop-daemon --start --pidfile ${PIDFILE} --exec ${DAEMON} \ |