------------------------------------------------------------
revno: 27
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sun 2014-02-02 12:08:18 +0000
message:
  auto update
added:
  etc/init/set.pretty-hostname.conf
modified:
  etc/init/nova-compute.conf


--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs

Your team Upstart Reviewers is subscribed to branch 
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to 
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/nova-compute.conf'
--- etc/init/nova-compute.conf	2013-11-18 12:42:03 +0000
+++ etc/init/nova-compute.conf	2014-02-02 12:08:18 +0000
@@ -1,20 +1,25 @@
+# vim: set ft=upstart et ts=2:
 description "Nova compute worker"
 author "Soren Hansen <[email protected]>"
 
 start on runlevel [2345]
 stop on runlevel [!2345]
 
-
 chdir /var/run
 
 pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-
-	modprobe nbd
+  mkdir -p /var/run/nova
+  chown nova:root /var/run/nova/
+
+  mkdir -p /var/lock/nova
+  chown nova:root /var/lock/nova/
+
+  modprobe nbd
+
+  # If libvirt-bin is installed, always wait for it to start first
+  if status libvirt-bin; then
+    start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
+  fi
 end script
 
 exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf

=== added file 'etc/init/set.pretty-hostname.conf'
--- etc/init/set.pretty-hostname.conf	1970-01-01 00:00:00 +0000
+++ etc/init/set.pretty-hostname.conf	2014-02-02 12:08:18 +0000
@@ -0,0 +1,19 @@
+# Set pretty hostname
+#
+# This sets the pretty hostname in /etc/machine-info to the model name
+
+
+description "Set pretty hostname"
+
+task
+
+start on (started dbus and starting bluetooth)
+
+script
+	if [ -x `which getprop` ] && [ ! -s /etc/writable/machine-info ]; then
+		device=`getprop ro.product.model`
+		if [ "$device" != "" ]; then
+			hostnamectl --pretty set-hostname "$device"
+		fi
+	fi
+end script

-- 
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/upstart-devel

Reply via email to