diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2013-02-21 22:51:02 -0800 |
| commit | 575a084808db7d5ac607a848b018abe676e73a91 (patch) | |
| tree | 34e179b0623074e6cd6fc03e4b3db001f8e493bf /sysvinit/cloud-init-local | |
| parent | 9dfb60d3144860334ab1ad1d72920d962139461f (diff) | |
| parent | d4886b65549c886499141872a9928412a74bbea2 (diff) | |
| download | vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.tar.gz vyos-cloud-init-575a084808db7d5ac607a848b018abe676e73a91.zip | |
Update to code on trunk.
Diffstat (limited to 'sysvinit/cloud-init-local')
| -rwxr-xr-x | sysvinit/cloud-init-local | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sysvinit/cloud-init-local b/sysvinit/cloud-init-local index 0c63b9b0..b53e0db2 100755 --- a/sysvinit/cloud-init-local +++ b/sysvinit/cloud-init-local @@ -29,15 +29,13 @@ # Should-Start: $time # Required-Stop: # Should-Stop: -# Default-Start: 3 5 -# Default-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: The initial cloud-init job (local fs contingent) # Description: Start cloud-init and runs the initialization phases # and any associated initial modules as desired. ### END INIT INFO -. /etc/init.d/functions - # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error @@ -60,8 +58,9 @@ prog="cloud-init" cloud_init="/usr/bin/cloud-init" conf="/etc/cloud/cloud.cfg" -# If there exists a sysconfig variable override file use it... +# If there exist sysconfig/default variable override files use it... [ -f /etc/sysconfig/cloud-init ] && . /etc/sysconfig/cloud-init +[ -f /etc/default/cloud-init ] && . /etc/default/cloud-init start() { [ -x $cloud_init ] || return 5 @@ -80,8 +79,6 @@ stop() { return $RETVAL } -. /etc/init.d/functions - case "$1" in start) start |