diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-07-25 16:34:19 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-07-25 16:34:19 -0400 |
| commit | 068009432909ae54b42e2cb56ec6557b04c677b0 (patch) | |
| tree | 48763836cac6a3f1f3f886dd8be8c074134e3217 /sysvinit | |
| parent | 198206b67f18f0f51bf057d76cee8b3a3526c8eb (diff) | |
| download | vyos-cloud-init-068009432909ae54b42e2cb56ec6557b04c677b0.tar.gz vyos-cloud-init-068009432909ae54b42e2cb56ec6557b04c677b0.zip | |
pull in fixes for debian bug 712985
Diffstat (limited to 'sysvinit')
| -rw-r--r--[-rwxr-xr-x] | sysvinit/debian/cloud-config | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | sysvinit/debian/cloud-final | 12 | ||||
| -rwxr-xr-x | sysvinit/debian/cloud-init | 14 | ||||
| -rw-r--r--[-rwxr-xr-x] | sysvinit/debian/cloud-init-local | 11 |
4 files changed, 48 insertions, 1 deletions
diff --git a/sysvinit/debian/cloud-config b/sysvinit/debian/cloud-config index 57888653..53322748 100755..100644 --- a/sysvinit/debian/cloud-config +++ b/sysvinit/debian/cloud-config @@ -11,6 +11,7 @@ # Authors: Julien Danjou <acid@debian.org> # Juerg Haefliger <juerg.haefliger@hp.com> +# Thomas Goirand <zigo@debian.org> PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Cloud service" @@ -30,6 +31,17 @@ SCRIPTNAME=/etc/init.d/$NAME # 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" diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final index 46e9b454..55afc8b0 100755..100644 --- a/sysvinit/debian/cloud-final +++ b/sysvinit/debian/cloud-final @@ -13,6 +13,7 @@ # Authors: Julien Danjou <acid@debian.org> # Juerg Haefliger <juerg.haefliger@hp.com> +# Thomas Goirand <zigo@debian.org> PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Cloud service" @@ -32,6 +33,17 @@ SCRIPTNAME=/etc/init.d/$NAME # 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" diff --git a/sysvinit/debian/cloud-init b/sysvinit/debian/cloud-init index 15ffeb2e..48fa0423 100755 --- a/sysvinit/debian/cloud-init +++ b/sysvinit/debian/cloud-init @@ -10,7 +10,8 @@ # Description: Cloud configuration initialization ### END INIT INFO -# Author: Julien Danjou <acid@debian.org> +# Authors: Julien Danjou <acid@debian.org> +# Thomas Goirand <zigo@debian.org> PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Cloud service" @@ -30,6 +31,17 @@ SCRIPTNAME=/etc/init.d/$NAME # 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" diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local index a1685c1e..802ee8e9 100755..100644 --- a/sysvinit/debian/cloud-init-local +++ b/sysvinit/debian/cloud-init-local @@ -30,6 +30,17 @@ SCRIPTNAME=/etc/init.d/$NAME # 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" |