Merge lp:~stgraber/ubuntu/saucy/lxc-android-config/upstart-fixes into lp:ubuntu/saucy/lxc-android-config

[Stéphane Graber]

Fix some upstart issues.

Fix some upstart issues.

[Dimitri John Ledkov (xnox)]

Hm, I wish lxc-stop can support "-s -k" clean shutdown, and eventually kill everything. But simply killing also works, as actually android doesn't have any sensible shutdown mechanisms => their shutdown command syncs filesystems and kills everything. I guess I need this changes to get the emulator working properly and/or experiment with starting and stopping the lxc container.

review: Approve

[Dimitri John Ledkov (xnox)]

bah, this has already landed via upstream project.

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-25 17:50:56 +0000
+++ debian/changelog	2013-09-25 19:44:16 +0000
@@ -1,3 +1,10 @@
+lxc-android-config (0.103) UNRELEASED; urgency=low
+
+  * Fix some issues with the upstart job so that it gets into the right
+    state at boot time and properly shuts down.
+
+ -- Stéphane Graber <[e-mail]>  Wed, 25 Sep 2013 15:42:51 -0400
+
 lxc-android-config (0.102) saucy; urgency=low
 
   [ Sebastien Bacher ]

=== modified file 'debian/lxc-android-config.upstart'
--- debian/lxc-android-config.upstart	2013-08-27 12:38:24 +0000
+++ debian/lxc-android-config.upstart	2013-09-25 19:44:16 +0000
@@ -9,6 +9,10 @@
 
 emits android
 
+console none
+
+exec lxc-start -n android -- /init
+
 post-start script
     if [ ! -d /dev/cpuctl ] && [ -d /sys/fs/cgroup/cpu ]; then
         mkdir /dev/cpuctl
@@ -25,8 +29,4 @@
     initctl emit android
 end script
 
-exec lxc-start -n android -d -- /init
-
-pre-stop script
-    exec lxc-stop -n android
-end script
+pre-stop exec lxc-stop -n android -k