8 files changed, 0 insertions, 269 deletions
diff --git a/upstart/cloud-config.conf b/upstart/cloud-config.conf
deleted file mode 100644
index 2c3ef67b..00000000
--- a/upstart/cloud-config.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloud-config - Handle applying the settings specified in cloud-config
-description "Handle applying cloud-config"
-emits cloud-config
-
-start on (filesystem and started rsyslog)
-console output
-task
-
-exec cloud-init modules --mode=config
diff --git a/upstart/cloud-final.conf b/upstart/cloud-final.conf
deleted file mode 100644
index 72ae5052..00000000
--- a/upstart/cloud-final.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# cloud-final.conf - run "final" jobs
-# this runs around traditional "rc.local" time.
-# and after all cloud-config jobs are run
-description "execute cloud user/final scripts"
-
-start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
-console output
-task
-
-exec cloud-init modules --mode=final
diff --git a/upstart/cloud-init-blocknet.conf b/upstart/cloud-init-blocknet.conf
deleted file mode 100644
index be09e7d8..00000000
--- a/upstart/cloud-init-blocknet.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-# cloud-init-blocknet
-# the purpose of this job is
-#  * to block networking from coming up until cloud-init-nonet has run
-#  * timeout if they all do not come up in a reasonable amount of time
-description "block networking until cloud-init-local"
-start on (starting network-interface
-          or starting network-manager
-          or starting networking)
-stop on stopped cloud-init-local
-
-instance $JOB${INTERFACE:+/}${INTERFACE:-}
-export INTERFACE
-task
-
-script
-   set +e  # you cannot trap TERM reliably with 'set -e'
-   SLEEP_CHILD=""
-
-   static_network_up() {
-      local emitted="/run/network/static-network-up-emitted"
-      # /run/network/static-network-up-emitted is written by
-      # upstart (via /etc/network/if-up.d/upstart). its presense would
-      # indicate that static-network-up has already fired.
-      [ -e "$emitted" -o -e "/var/$emitted" ]
-   }
-   msg() {
-      local uptime="" idle="" msg=""
-      if [ -r /proc/uptime ]; then
-         read uptime idle < /proc/uptime
-      fi
-      msg="${UPSTART_INSTANCE}${uptime:+[${uptime}]}: $*"
-      echo "$msg"
-   }
-
-   handle_sigterm() {
-      # if we received sigterm and static networking is up then it probably
-      # came from upstart as a result of 'stop on static-network-up'
-      msg "got sigterm"
-      if [ -n "$SLEEP_CHILD" ]; then
-          if ! kill $SLEEP_CHILD 2>/dev/null; then
-              [ ! -d "/proc/$SLEEP_CHILD" ] ||
-                  msg "hm.. failed to kill sleep pid $SLEEP_CHILD"
-          fi
-      fi
-      msg "stopped"
-      exit 0
-   }
-
-   dowait() {
-      msg "blocking $1 seconds"
-      # all this 'exec -a' does is get me a nicely named process in 'ps'
-      # ie, 'sleep-block-network-interface.eth1'
-      if [ -x /bin/bash ]; then 
-         bash -c 'exec -a sleep-block-$1 sleep $2' -- "$UPSTART_INSTANCE" "$1" &
-      else
-         sleep "$1" &
-      fi
-      SLEEP_CHILD=$!
-      msg "sleepchild=$SLEEP_CHILD"
-      wait $SLEEP_CHILD
-      SLEEP_CHILD=""
-   }
-
-   trap handle_sigterm TERM
-
-   if [ -n "$INTERFACE" -a "${INTERFACE#lo}" != "${INTERFACE}" ]; then
-     msg "ignoring interface ${INTERFACE}";
-     exit 0;
-   fi
-
-   # static_network_up already occurred
-   static_network_up && { msg "static_network_up already"; exit 0; }
-
-   # local-finished cloud-init-local success or failure
-   lfin="/run/cloud-init/local-finished"
-   disable="/etc/cloud/no-blocknet"
-   [ -f "$lfin" ] && { msg "$lfin found"; exit 0; }
-   [ -f "$disable" ] && { msg "$disable found"; exit 0; }
-
-   dowait 120
-   msg "gave up waiting for $lfin"
-   exit 1
-end script
diff --git a/upstart/cloud-init-container.conf b/upstart/cloud-init-container.conf
deleted file mode 100644
index 6bdbe77e..00000000
--- a/upstart/cloud-init-container.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-# in a lxc container, events for network interfaces do not
-# get created or may be missed.  This helps cloud-init-nonet along
-# by emitting those events if they have not been emitted.
-
-start on container
-stop on static-network-up
-task
-
-emits net-device-added
-
-console output
-
-script
-   # if we are inside a container, then we may have to emit the ifup
-   # events for 'auto' network devices.
-   set -f
-
-   # from /etc/network/if-up.d/upstart
-   MARK_DEV_PREFIX="/run/network/ifup."
-   MARK_STATIC_NETWORK_EMITTED="/run/network/static-network-up-emitted"
-   # if the all static network interfaces are already up, nothing to do
-   [ -f "$MARK_STATIC_NETWORK_EMITTED" ] && exit 0
-
-   # ifquery will exit failure if there is no /run/network directory.
-   # normally that would get created by one of network-interface.conf
-   # or networking.conf.  But, it is possible that we're running
-   # before either of those have.
-   mkdir -p /run/network
-
-   # get list of all 'auto' interfaces. if there are none, nothing to do.
-   auto_list=$(ifquery --list --allow auto 2>/dev/null) || :
-   [ -z "$auto_list" ] && exit 0
-   set -- ${auto_list}
-   [ "$*" = "lo" ] && exit 0
-
-   # we only want to emit for interfaces that do not exist, so filter
-   # out anything that does not exist.
-   for iface in "$@"; do
-      [ "$iface" = "lo" ] && continue
-      # skip interfaces that are already up
-      [ -f "${MARK_DEV_PREFIX}${iface}" ] && continue
-
-      if [ -d /sys/net ]; then
-         # if /sys is mounted, and there is no /sys/net/iface, then no device
-         [ -e "/sys/net/$iface" ] && continue
-      else
-         # sys wasn't mounted, so just check via 'ifconfig'
-         ifconfig "$iface" >/dev/null 2>&1 || continue
-      fi
-      initctl emit --no-wait net-device-added "INTERFACE=$iface" &&
-         emitted="$emitted $iface" ||
-         echo "warn: ${UPSTART_JOB} failed to emit net-device-added INTERFACE=$iface"
-   done
-
-   [ -z "${emitted# }" ] ||
-      echo "${UPSTART_JOB}: emitted ifup for ${emitted# }"
-end script
diff --git a/upstart/cloud-init-local.conf b/upstart/cloud-init-local.conf
deleted file mode 100644
index 5def043d..00000000
--- a/upstart/cloud-init-local.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloud-init - the initial cloud-init job
-#   crawls metadata service, emits cloud-config
-start on mounted MOUNTPOINT=/ and mounted MOUNTPOINT=/run
-
-task
-
-console output
-
-script
-  lfin=/run/cloud-init/local-finished
-  ret=0
-  cloud-init init --local || ret=$?
-  [ -r /proc/uptime ] && read up idle < /proc/uptime || up="N/A"
-  echo "$ret up $up" > "$lfin"
-  exit $ret
-end script
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
deleted file mode 100644
index 6abf6573..00000000
--- a/upstart/cloud-init-nonet.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# cloud-init-no-net
-# the purpose of this job is
-#  * to block running of cloud-init until all network interfaces
-#    configured in /etc/network/interfaces are up
-#  * timeout if they all do not come up in a reasonable amount of time
-start on mounted MOUNTPOINT=/ and stopped cloud-init-local
-stop on static-network-up
-task
-
-console output
-
-script
-   set +e  # you cannot trap TERM reliably with 'set -e'
-   SLEEP_CHILD=""
-
-   static_network_up() {
-      local emitted="/run/network/static-network-up-emitted"
-      # /run/network/static-network-up-emitted is written by
-      # upstart (via /etc/network/if-up.d/upstart). its presense would
-      # indicate that static-network-up has already fired.
-      [ -e "$emitted" -o -e "/var/$emitted" ]
-   }
-   msg() {
-      local uptime="" idle=""
-      if [ -r /proc/uptime ]; then
-         read uptime idle < /proc/uptime
-      fi
-      echo "$UPSTART_JOB${uptime:+[${uptime}]}:" "$1"
-   }
-
-   handle_sigterm() {
-      # if we received sigterm and static networking is up then it probably
-      # came from upstart as a result of 'stop on static-network-up'
-      if [ -n "$SLEEP_CHILD" ]; then
-          if ! kill $SLEEP_CHILD 2>/dev/null; then
-              [ ! -d "/proc/$SLEEP_CHILD" ] ||
-                  msg "hm.. failed to kill sleep pid $SLEEP_CHILD"
-          fi
-      fi
-      if static_network_up; then
-         msg "static networking is now up"
-         exit 0
-      fi
-      msg "recieved SIGTERM, networking not up"
-      exit 2
-   }
-
-   dowait() {
-      [ $# -eq 2 ] || msg "waiting $1 seconds for network device"
-      sleep "$1" &
-      SLEEP_CHILD=$!
-      wait $SLEEP_CHILD
-      SLEEP_CHILD=""
-   }
-
-   trap handle_sigterm TERM
-
-   # static_network_up already occurred
-   static_network_up && exit 0
-
-   dowait 5 silent
-   dowait 10
-   dowait 115
-   msg "gave up waiting for a network device."
-   : > /var/lib/cloud/data/no-net
-end script
diff --git a/upstart/cloud-init.conf b/upstart/cloud-init.conf
deleted file mode 100644
index 41ddd284..00000000
--- a/upstart/cloud-init.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloud-init - the initial cloud-init job
-#   crawls metadata service, emits cloud-config
-start on mounted MOUNTPOINT=/ and stopped cloud-init-nonet
-
-task
-
-console output
-
-exec /usr/bin/cloud-init init
diff --git a/upstart/cloud-log-shutdown.conf b/upstart/cloud-log-shutdown.conf
deleted file mode 100644
index 278b9c06..00000000
--- a/upstart/cloud-log-shutdown.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# log shutdowns and reboots to the console (/dev/console)
-# this is useful for correlating logs
-start on runlevel PREVLEVEL=2
-
-task
-console output
-
-script
-  # runlevel(7) says INIT_HALT will be set to HALT or POWEROFF
-  date=$(date --utc)
-  case "$RUNLEVEL:$INIT_HALT" in
-     6:*)        mode="reboot";;
-     0:HALT)     mode="halt";;
-     0:POWEROFF) mode="poweroff";;
-     0:*)        mode="shutdown-unknown";;
-  esac
-  { read seconds idle < /proc/uptime; } 2>/dev/null || :
-  echo "$date: shutting down for $mode${seconds:+ [up ${seconds%.*}s]}."
-end script