diff options
author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-02-21 13:58:32 +0000 |
---|---|---|
committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-02-21 13:58:32 +0000 |
commit | c4ca31e04c604a0d3428faabd0ee443d17ecc7e7 (patch) | |
tree | 7718332ba0f1fbd1eff6b4c3f942cc66fa4781f3 /encap | |
parent | 79a8958bc2502912e2fbba8ca15ed1eb2377d614 (diff) | |
download | bcfg2-c4ca31e04c604a0d3428faabd0ee443d17ecc7e7.tar.gz bcfg2-c4ca31e04c604a0d3428faabd0ee443d17ecc7e7.tar.bz2 bcfg2-c4ca31e04c604a0d3428faabd0ee443d17ecc7e7.zip |
EncapPackages: Made runit support Upstart (used instead of /etc/inittab in recent Ubuntu releases)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2861 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap')
-rw-r--r-- | encap/src/encap-profiles/runit-1.7.2.ep | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/encap/src/encap-profiles/runit-1.7.2.ep b/encap/src/encap-profiles/runit-1.7.2.ep index afd02bca9..d2765f657 100644 --- a/encap/src/encap-profiles/runit-1.7.2.ep +++ b/encap/src/encap-profiles/runit-1.7.2.ep @@ -84,11 +84,24 @@ exec env - PATH=$PATH \ runsvdir -P /usr/local/var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................' ]]></include_file> -<include_file name="boot.inittab" mode="0644"><![CDATA[ +<include_file name="inittab.boot" mode="0644"><![CDATA[ SV:123456:respawn:/usr/local/bin/runsvdir-usrlocal-start ]]></include_file> +<include_file name="upstart.boot" mode="0644"><![CDATA[ +# /etc/event.d/SV 0644 +# +# for runit - manage /usr/local/bin/runsvdir-usrlocal-start +# +start on runlevel-2 +start on runlevel-3 +start on runlevel-4 +start on runlevel-5 +stop on shutdown +respawn /usr/local/bin/runsvdir-usrlocal-start +]]></include_file> + <include_file name="inittab-install" mode="0755"><![CDATA[ #!/bin/sh -e if grep SV: /etc/inittab >/dev/null @@ -98,7 +111,7 @@ then else echo 'Adding runsvdir to inittab...' rm -f /etc/inittab'{new}' - cat /etc/inittab boot.inittab > /etc/inittab'{new}' + cat /etc/inittab inittab.boot > /etc/inittab'{new}' mv -f /etc/inittab'{new}' /etc/inittab kill -HUP 1 echo 'init should start runsvdir now. @@ -140,7 +153,14 @@ test -d /usr/local/var/service || mkdir /usr/local/var/service test -d /usr/local/etc || mkdir /usr/local/etc test -d /usr/local/etc/default || mkdir /usr/local/etc/default test -d /usr/local/etc/sv || mkdir /usr/local/etc/sv -cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-install +if [ -f /etc/inittab ]; then + printf "Installing to /etc/inittab ...\n" + cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-install +fi +if [ -d /etc/event.d ]; then + printf "Installing to /etc/event.d/SV (Upstart) ...\n" + cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && cp upstart.boot /etc/event.d/SV +fi printf "Finished runit postinstall script.\n" ]]></include_file> @@ -148,7 +168,16 @@ printf "Finished runit postinstall script.\n" #!/bin/sh printf "Running runit preremove script...\n" date -cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-remove +if [ -f /etc/inittab ]; then + printf "Removing from /etc/inittab ...\n" + cd ${ENCAP_SOURCE}/${ENCAP_PKGNAME} && ./inittab-remove +fi +if [ -d /etc/event.d ]; then + if [ -f /etc/event.d/SV ]; then + printf "Removing /etc/event.d/SV (Upstart) ...\n" + rm /etc/event.d/SV + fi +fi printf "Finished runit preremove script.\n" ]]></include_file> |