[moblab] Improve the naming of the upstart directory.

Just a clean up to help with readability.

TEST=emerge-fizz-moblab sys-apps/moblab
BUG=None

Change-Id: I95d009f67fbccc542745a196f007ed541cca2c99
Reviewed-on: https://chromium-review.googlesource.com/1532526
Commit-Ready: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
diff --git a/Makefile b/Makefile
index f73196b..9ce2098 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-SUBDIRS := upstart_init tools mobmonitor mobmonitor-ui
+SUBDIRS := upstart-scripts tools mobmonitor mobmonitor-ui
 
 INSTALL_SUBDIRS = $(SUBDIRS)
 
diff --git a/src/upstart_init/Makefile b/src/upstart-scripts/Makefile
similarity index 100%
rename from src/upstart_init/Makefile
rename to src/upstart-scripts/Makefile
diff --git a/src/upstart_init/boot-logging-moblab.conf b/src/upstart-scripts/boot-logging-moblab.conf
similarity index 100%
rename from src/upstart_init/boot-logging-moblab.conf
rename to src/upstart-scripts/boot-logging-moblab.conf
diff --git a/src/upstart_init/job_aborter.conf b/src/upstart-scripts/job_aborter.conf
similarity index 100%
rename from src/upstart_init/job_aborter.conf
rename to src/upstart-scripts/job_aborter.conf
diff --git a/src/upstart_init/moblab-apache-init.conf b/src/upstart-scripts/moblab-apache-init.conf
similarity index 100%
rename from src/upstart_init/moblab-apache-init.conf
rename to src/upstart-scripts/moblab-apache-init.conf
diff --git a/src/upstart_init/moblab-autotest-setup.conf b/src/upstart-scripts/moblab-autotest-setup.conf
similarity index 100%
rename from src/upstart_init/moblab-autotest-setup.conf
rename to src/upstart-scripts/moblab-autotest-setup.conf
diff --git a/src/upstart_init/moblab-base-container-init.conf b/src/upstart-scripts/moblab-base-container-init.conf
similarity index 90%
rename from src/upstart_init/moblab-base-container-init.conf
rename to src/upstart-scripts/moblab-base-container-init.conf
index b12f2f5..f750a85 100644
--- a/src/upstart_init/moblab-base-container-init.conf
+++ b/src/upstart-scripts/moblab-base-container-init.conf
@@ -20,8 +20,10 @@
   # If a base container is pre-installed in the image copy it
   # to the containers directory
   if [ -d "/moblab-base-container" ]; then
-    tar xfk /moblab-base-container/moblab_base*xz \
-      -C /usr/local/autotest/containers/
+    tar xf \
+      /moblab-base-container/moblab_base*xz \
+      -C /usr/local/autotest/containers/ \
+      --overwrite
   fi
   # Sleep a second after moblab-containers-dir-init has stopped.
   sleep 1
diff --git a/src/upstart_init/moblab-bootup-status-init.conf b/src/upstart-scripts/moblab-bootup-status-init.conf
similarity index 100%
rename from src/upstart_init/moblab-bootup-status-init.conf
rename to src/upstart-scripts/moblab-bootup-status-init.conf
diff --git a/src/upstart_init/moblab-containers-dir-init.conf b/src/upstart-scripts/moblab-containers-dir-init.conf
similarity index 100%
rename from src/upstart_init/moblab-containers-dir-init.conf
rename to src/upstart-scripts/moblab-containers-dir-init.conf
diff --git a/src/upstart_init/moblab-database-init.conf b/src/upstart-scripts/moblab-database-init.conf
similarity index 100%
rename from src/upstart_init/moblab-database-init.conf
rename to src/upstart-scripts/moblab-database-init.conf
diff --git a/src/upstart_init/moblab-database-test-importer.conf b/src/upstart-scripts/moblab-database-test-importer.conf
similarity index 100%
rename from src/upstart_init/moblab-database-test-importer.conf
rename to src/upstart-scripts/moblab-database-test-importer.conf
diff --git a/src/upstart_init/moblab-devserver-cleanup-init.conf b/src/upstart-scripts/moblab-devserver-cleanup-init.conf
similarity index 100%
rename from src/upstart_init/moblab-devserver-cleanup-init.conf
rename to src/upstart-scripts/moblab-devserver-cleanup-init.conf
diff --git a/src/upstart_init/moblab-devserver-init.conf b/src/upstart-scripts/moblab-devserver-init.conf
similarity index 100%
rename from src/upstart_init/moblab-devserver-init.conf
rename to src/upstart-scripts/moblab-devserver-init.conf
diff --git a/src/upstart_init/moblab-dhcpd-init.conf b/src/upstart-scripts/moblab-dhcpd-init.conf
similarity index 100%
rename from src/upstart_init/moblab-dhcpd-init.conf
rename to src/upstart-scripts/moblab-dhcpd-init.conf
diff --git a/src/upstart_init/moblab-external-settings-init.conf b/src/upstart-scripts/moblab-external-settings-init.conf
similarity index 100%
rename from src/upstart_init/moblab-external-settings-init.conf
rename to src/upstart-scripts/moblab-external-settings-init.conf
diff --git a/src/upstart_init/moblab-external-storage-init.conf b/src/upstart-scripts/moblab-external-storage-init.conf
similarity index 100%
rename from src/upstart_init/moblab-external-storage-init.conf
rename to src/upstart-scripts/moblab-external-storage-init.conf
diff --git a/src/upstart_init/moblab-gsoffloader-init.conf b/src/upstart-scripts/moblab-gsoffloader-init.conf
similarity index 100%
rename from src/upstart_init/moblab-gsoffloader-init.conf
rename to src/upstart-scripts/moblab-gsoffloader-init.conf
diff --git a/src/upstart_init/moblab-gsoffloader_s-init.conf b/src/upstart-scripts/moblab-gsoffloader_s-init.conf
similarity index 100%
rename from src/upstart_init/moblab-gsoffloader_s-init.conf
rename to src/upstart-scripts/moblab-gsoffloader_s-init.conf
diff --git a/src/upstart_init/moblab-homedir-init.conf b/src/upstart-scripts/moblab-homedir-init.conf
similarity index 100%
rename from src/upstart_init/moblab-homedir-init.conf
rename to src/upstart-scripts/moblab-homedir-init.conf
diff --git a/src/upstart_init/moblab-host-scheduler-init.conf b/src/upstart-scripts/moblab-host-scheduler-init.conf
similarity index 100%
rename from src/upstart_init/moblab-host-scheduler-init.conf
rename to src/upstart-scripts/moblab-host-scheduler-init.conf
diff --git a/src/upstart_init/moblab-internetcheck.conf b/src/upstart-scripts/moblab-internetcheck.conf
similarity index 100%
rename from src/upstart_init/moblab-internetcheck.conf
rename to src/upstart-scripts/moblab-internetcheck.conf
diff --git a/src/upstart_init/moblab-kill-long-running-sql-query.conf b/src/upstart-scripts/moblab-kill-long-running-sql-query.conf
similarity index 100%
rename from src/upstart_init/moblab-kill-long-running-sql-query.conf
rename to src/upstart-scripts/moblab-kill-long-running-sql-query.conf
diff --git a/src/upstart_init/moblab-mobmonitor-init.conf b/src/upstart-scripts/moblab-mobmonitor-init.conf
similarity index 100%
rename from src/upstart_init/moblab-mobmonitor-init.conf
rename to src/upstart-scripts/moblab-mobmonitor-init.conf
diff --git a/src/upstart_init/moblab-network-bridge-init.conf b/src/upstart-scripts/moblab-network-bridge-init.conf
similarity index 100%
rename from src/upstart_init/moblab-network-bridge-init.conf
rename to src/upstart-scripts/moblab-network-bridge-init.conf
diff --git a/src/upstart_init/moblab-scheduler-init.conf b/src/upstart-scripts/moblab-scheduler-init.conf
similarity index 100%
rename from src/upstart_init/moblab-scheduler-init.conf
rename to src/upstart-scripts/moblab-scheduler-init.conf
diff --git a/src/upstart_init/moblab-whining-update-db.conf b/src/upstart-scripts/moblab-whining-update-db.conf
similarity index 100%
rename from src/upstart_init/moblab-whining-update-db.conf
rename to src/upstart-scripts/moblab-whining-update-db.conf