From 1376ffe4de1e9cdcf5544ccecf50a18f46f7ed30 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@nelson>
Date: Tue, 12 Jan 2010 15:09:27 -0500
Subject: moving towards getting apt-update-upgrade working

---
 upstart/cloud-apt-update-upgrade.conf  |  2 +-
 upstart/cloud-config-ssh.conf          | 13 -------------
 upstart/cloud-config-ssh.conf.disabled | 13 +++++++++++++
 upstart/cloud-ebs-mounts.conf          | 12 ------------
 upstart/cloud-ebs-mounts.conf.disabled | 12 ++++++++++++
 upstart/cloud-raid.conf                | 12 ------------
 upstart/cloud-raid.conf.disabled       | 12 ++++++++++++
 upstart/cloud-runurl.conf              | 13 -------------
 upstart/cloud-runurl.conf.disabled     | 13 +++++++++++++
 9 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 upstart/cloud-config-ssh.conf
 create mode 100644 upstart/cloud-config-ssh.conf.disabled
 delete mode 100644 upstart/cloud-ebs-mounts.conf
 create mode 100644 upstart/cloud-ebs-mounts.conf.disabled
 delete mode 100644 upstart/cloud-raid.conf
 create mode 100644 upstart/cloud-raid.conf.disabled
 delete mode 100644 upstart/cloud-runurl.conf
 create mode 100644 upstart/cloud-runurl.conf.disabled

(limited to 'upstart')

diff --git a/upstart/cloud-apt-update-upgrade.conf b/upstart/cloud-apt-update-upgrade.conf
index a5060f69..bf21cd8b 100644
--- a/upstart/cloud-apt-update-upgrade.conf
+++ b/upstart/cloud-apt-update-upgrade.conf
@@ -5,7 +5,7 @@
 description "Update software at boot"
 
 start on (cloud-config
-	and local-filesystem
+	and local-filesystems
 	and net-device-up IFACE=eth0)
 console output
 
diff --git a/upstart/cloud-config-ssh.conf b/upstart/cloud-config-ssh.conf
deleted file mode 100644
index 65d29941..00000000
--- a/upstart/cloud-config-ssh.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# ec2-preconf-ssh-keys
-#
-# Download preconfigured ssh-keys for EC2.
-
-description "Download preconfigured ssh keys"
-
-start on (cloud-config
-	and local-filesystem
-	and net-device-ifup IFACE=eth0 and starting ssh)
-console output
-task
-
-exec cloud-init-cfg config-ssh
diff --git a/upstart/cloud-config-ssh.conf.disabled b/upstart/cloud-config-ssh.conf.disabled
new file mode 100644
index 00000000..6127cb73
--- /dev/null
+++ b/upstart/cloud-config-ssh.conf.disabled
@@ -0,0 +1,13 @@
+# ec2-preconf-ssh-keys
+#
+# Download preconfigured ssh-keys for EC2.
+
+description "Download preconfigured ssh keys"
+
+start on (cloud-config
+	and local-filesystems
+	and net-device-ifup IFACE=eth0 and starting ssh)
+console output
+task
+
+exec cloud-init-cfg config-ssh
diff --git a/upstart/cloud-ebs-mounts.conf b/upstart/cloud-ebs-mounts.conf
deleted file mode 100644
index 03ddfa40..00000000
--- a/upstart/cloud-ebs-mounts.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# ec2-ebs-mounts
-#
-# Mount EC2 EBS mount points
-
-description	"Populate EBS mountpoints"
-
-start on cloud-config
-
-console output
-task
-
-exec cloud-init-cfg ec2-ebs-mounts
diff --git a/upstart/cloud-ebs-mounts.conf.disabled b/upstart/cloud-ebs-mounts.conf.disabled
new file mode 100644
index 00000000..03ddfa40
--- /dev/null
+++ b/upstart/cloud-ebs-mounts.conf.disabled
@@ -0,0 +1,12 @@
+# ec2-ebs-mounts
+#
+# Mount EC2 EBS mount points
+
+description	"Populate EBS mountpoints"
+
+start on cloud-config
+
+console output
+task
+
+exec cloud-init-cfg ec2-ebs-mounts
diff --git a/upstart/cloud-raid.conf b/upstart/cloud-raid.conf
deleted file mode 100644
index d4644c89..00000000
--- a/upstart/cloud-raid.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# ec2-raid - Setup ephemeral storage RAID and mount points
-#
-# Setup ephemeral storage RAID and mount points
-
-description "Setup RAID storage and moint points"
-
-start on (cloud-config
-	and local-filesystem)
-console output
-task
-
-exec cloud-init-cfg setup-raid
diff --git a/upstart/cloud-raid.conf.disabled b/upstart/cloud-raid.conf.disabled
new file mode 100644
index 00000000..d18dd551
--- /dev/null
+++ b/upstart/cloud-raid.conf.disabled
@@ -0,0 +1,12 @@
+# ec2-raid - Setup ephemeral storage RAID and mount points
+#
+# Setup ephemeral storage RAID and mount points
+
+description "Setup RAID storage and moint points"
+
+start on (cloud-config
+	and local-filesystems)
+console output
+task
+
+exec cloud-init-cfg setup-raid
diff --git a/upstart/cloud-runurl.conf b/upstart/cloud-runurl.conf
deleted file mode 100644
index f2140c32..00000000
--- a/upstart/cloud-runurl.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# ec2-runurl - Run runurl at boot
-#
-# Runurl at boot
-
-description "Run runurl"
-
-start on (cloud-config
-	and local-filesystem
-	and net-device-ifup IFACE=eth0)
-console output
-task
-
-exec cloud-init-cfg runurl
diff --git a/upstart/cloud-runurl.conf.disabled b/upstart/cloud-runurl.conf.disabled
new file mode 100644
index 00000000..3e2c46e0
--- /dev/null
+++ b/upstart/cloud-runurl.conf.disabled
@@ -0,0 +1,13 @@
+# ec2-runurl - Run runurl at boot
+#
+# Runurl at boot
+
+description "Run runurl"
+
+start on (cloud-config
+	and local-filesystems
+	and net-device-ifup IFACE=eth0)
+console output
+task
+
+exec cloud-init-cfg runurl
-- 
cgit v1.2.3