1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155
|
Index: cloud-init/sysvinit/debian/cloud-init-main
===================================================================
--- /dev/null
+++ cloud-init/sysvinit/debian/cloud-init-main
@@ -0,0 +1,73 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: cloud-init-main
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs
+# X-Start-Before: sshd
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Cloud init
+# Description: Cloud configuration initialization
+### END INIT INFO
+
+# Authors: Julien Danjou <acid@debian.org>
+# Thomas Goirand <zigo@debian.org>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Cloud service: Single Process"
+NAME=cloud-init
+DAEMON=/usr/bin/$NAME
+SCRIPTNAME=/etc/init.d/cloud-init-main
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+if init_is_upstart; then
+ case "$1" in
+ stop)
+ exit 0
+ ;;
+ *)
+ exit 1
+ ;;
+ esac
+fi
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC" "$NAME"
+ if grep -q 'cloud-init=disabled' /proc/cmdline; then
+ log_daemon_msg "$NAME is disabled via /proc/cmdline."
+ exit 0
+ elif test -e /etc/cloud/cloud-init.disabled; then
+ log_daemon_msg "$NAME is disabled via cloud-init.disabled file."
+ exit 0
+ fi
+
+ # This is currently a no-op under sysvinit
+ :
+
+ case "$?" in
+ 0|1) log_end_msg 0 ;;
+ 2) log_end_msg 1 ;;
+ esac
+ ;;
+ stop|restart|force-reload)
+ echo "Error: argument '$1' not supported" >&2
+ exit 3
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start}" >&2
+ exit 3
+ ;;
+esac
+
+:
Index: cloud-init/sysvinit/debian/cloud-init
===================================================================
--- cloud-init.orig/sysvinit/debian/cloud-init
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: cloud-init
-# Required-Start: $local_fs $remote_fs $syslog $network cloud-init-local
-# Required-Stop: $remote_fs
-# X-Start-Before: sshd
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Cloud init
-# Description: Cloud configuration initialization
-### END INIT INFO
-
-# Authors: Julien Danjou <acid@debian.org>
-# Thomas Goirand <zigo@debian.org>
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Cloud service"
-NAME=cloud-init
-DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="init"
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-if init_is_upstart; then
- case "$1" in
- stop)
- exit 0
- ;;
- *)
- exit 1
- ;;
- esac
-fi
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC" "$NAME"
- if grep -q 'cloud-init=disabled' /proc/cmdline; then
- log_daemon_msg "$NAME is disabled via /proc/cmdline."
- exit 0
- elif test -e /etc/cloud/cloud-init.disabled; then
- log_daemon_msg "$NAME is disabled via cloud-init.disabled file."
- exit 0
- fi
-
- $DAEMON ${DAEMON_ARGS}
- case "$?" in
- 0|1) log_end_msg 0 ;;
- 2) log_end_msg 1 ;;
- esac
- ;;
- stop|restart|force-reload)
- echo "Error: argument '$1' not supported" >&2
- exit 3
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start}" >&2
- exit 3
- ;;
-esac
-
-:
|