Make cgroups preexisting hard dependency

activemq/setup/etc/init.d/activemq

@@ -2,10 +2,6 @@
 
 description="ActiveMQ container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	/usr/bin/lxc-start activemq
 }

basic/srv/vm/mgr/__init__.py

@@ -189,11 +189,14 @@ class VMMgr:
         return deps
 
     def get_app_deps(self, app):
-        # Get "needs" line from init script and split it to list, skipping first two elements (docker, net)
+        # Get "needs" line from init script and split it to list
         try:
             with open(os.path.join('/etc/init.d', app), 'r') as f:
-                return [l.split()[2:] for l in f.readlines() if l.startswith('\tneed')][0]
+                for line in f.readlines():
+                    if line.strip().startswith('need'):
+                        return line.split()[1:]
         except:
+            pass
         return []
 
     def enable_autostart(self, app):

ckan-datapusher/setup/etc/init.d/ckan-datapusher

@@ -2,10 +2,6 @@
 
 description="CKAN DataPusher container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start ckan-datapusher
 }

ckan/setup/etc/init.d/ckan

@@ -3,7 +3,7 @@
 description="CKAN container"
 
 depend() {
-	need cgroups ckan-datapusher postgres redis solr
+	need ckan-datapusher postgres redis solr
 }
 
 start() {

crisiscleanup/setup/etc/init.d/crisiscleanup

@@ -3,7 +3,7 @@
 description="Crisis Cleanup container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

cts/setup/etc/init.d/cts

@@ -3,7 +3,7 @@
 description="CTS container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

frontlinesms/setup/etc/init.d/frontlinesms

@@ -2,10 +2,6 @@
 
 description="FrontlineSMS container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start frontlinesms
 }

gnuhealth/setup/etc/init.d/gnuhealth

@@ -3,7 +3,7 @@
 description="GNU Health container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

kanboard/setup/etc/init.d/kanboard

@@ -3,7 +3,7 @@
 description="KanBoard container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

mariadb/setup/etc/init.d/mariadb

@@ -2,10 +2,6 @@
 
 description="MariaDB container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	/usr/bin/lxc-start mariadb
 }

mifosx/setup/etc/init.d/mifosx

@@ -3,7 +3,7 @@
 description="Mifos X container"
 
 depend() {
-	need cgroups mariadb
+	need mariadb
 }
 
 start() {

motech/setup/etc/init.d/motech

@@ -3,7 +3,7 @@
 description="Motech container"
 
 depend() {
-	need cgroups activemq postgres
+	need activemq postgres
 }
 
 start() {

opendatakit-build/setup/etc/init.d/opendatakit-build

@@ -3,7 +3,7 @@
 description="OpenDataKit Build container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

opendatakit/setup/etc/init.d/opendatakit

@@ -3,7 +3,7 @@
 description="OpenDataKit Aggregate container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

openmapkit/setup/etc/init.d/openmapkit

@@ -2,10 +2,6 @@
 
 description="OpenMapKit container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start openmapkit
 }

pandora/setup/etc/init.d/pandora

@@ -3,7 +3,7 @@
 description="Pan.do/ra container"
 
 depend() {
-	need cgroups postgres rabbitmq
+	need postgres rabbitmq
 }
 
 start() {

postgres/setup/etc/init.d/postgres

@@ -2,10 +2,6 @@
 
 description="Postgres container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start postgres
 }

rabbitmq/setup/etc/init.d/rabbitmq

@@ -2,10 +2,6 @@
 
 description="RabbitMQ container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start rabbitmq
 }

redis/setup/etc/init.d/redis

@@ -2,10 +2,6 @@
 
 description="Redis container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start redis
 }

sahana-demo/setup/etc/init.d/sahana-demo

@@ -3,7 +3,7 @@
 description="Sahana Eden Demo container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

sahana/setup/etc/init.d/sahana

@@ -3,7 +3,7 @@
 description="Sahana Eden container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

sambro/setup/etc/init.d/sambro

@@ -3,7 +3,7 @@
 description="SAMBRO container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

seeddms/setup/etc/init.d/seeddms

@@ -3,7 +3,7 @@
 description="SeedDMS container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

sigmah/setup/etc/init.d/sigmah

@@ -3,7 +3,7 @@
 description="Sigmah container"
 
 depend() {
-	need cgroups postgres
+	need postgres
 }
 
 start() {

solr/setup/etc/init.d/solr

@@ -2,10 +2,6 @@
 
 description="Solr container"
 
-depend() {
-	need cgroups
-}
-
 start() {
 	lxc-start solr
 }

ushahidi/setup/etc/init.d/ushahidi

@@ -3,7 +3,7 @@
 description="Ushahidi container"
 
 depend() {
-	need cgroups mariadb
+	need mariadb
 }
 
 start() {