diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2013-02-21 11:57:25 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-02-21 11:57:25 -0500 |
| commit | d4886b65549c886499141872a9928412a74bbea2 (patch) | |
| tree | 200a0bc7217b5f8415205acd1c063e143978e34f /sysvinit/cloud-config | |
| parent | 174bc39e6b2c1cac3f73f67f25fad87cab16fa42 (diff) | |
| parent | 10ea1c0bb933b21d32012d89b218a3bbbd15a75a (diff) | |
| download | vyos-cloud-init-d4886b65549c886499141872a9928412a74bbea2.tar.gz vyos-cloud-init-d4886b65549c886499141872a9928412a74bbea2.zip | |
Few patches to make life on Debian 6 stable happier:
* Added arguments to packages/bddeb:
-d pass through '-d' to debuild
--no-cloud-utils don't depend on cloud-utils package (default: False)
These are essential for building on Debian 6, because there are
no python-mocker (build dependency) and cloud-utils (install dependency)
in squeeze and squeeze-backports.
* SysVinit startup scripts modified to run both on RHEL and Debian,
* (Unfortunately) New option INIT_SYSTEM=sysvinit_deb for Debian /etc/init.d/
directory
* Make separate Ubuntu and Debian APT source template (cc_apt_configure)
I'm now generating working Debian 6 package following way:
INIT_SYSTEM=sysvinit_deb packages/bddeb -us -uc --no-cloud-utils -d
Diffstat (limited to 'sysvinit/cloud-config')
| -rwxr-xr-x | sysvinit/cloud-config | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sysvinit/cloud-config b/sysvinit/cloud-config index e587446d..ad8ed831 100755 --- a/sysvinit/cloud-config +++ b/sysvinit/cloud-config @@ -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 config cloud-init job # Description: Start cloud-init and runs the config phase # and any associated config 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 |