summaryrefslogtreecommitdiffstats
path: root/encap/src/makeself-dist/makedist.sh
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-02-20 03:08:47 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2007-02-20 03:08:47 +0000
commit79a8958bc2502912e2fbba8ca15ed1eb2377d614 (patch)
treeb5d0538885190d05eb4a469c20f5cc12e4aa0933 /encap/src/makeself-dist/makedist.sh
parent603402bbe43510ef50a10819e95854d58dd63cc4 (diff)
downloadbcfg2-79a8958bc2502912e2fbba8ca15ed1eb2377d614.tar.gz
bcfg2-79a8958bc2502912e2fbba8ca15ed1eb2377d614.tar.bz2
bcfg2-79a8958bc2502912e2fbba8ca15ed1eb2377d614.zip
EncapPackages: Move from daemontools to runit to avoid any issues with redistributing patched daemontool binaries.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2856 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/src/makeself-dist/makedist.sh')
-rwxr-xr-xencap/src/makeself-dist/makedist.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh
index 8c80f2e14..fdd5e81df 100755
--- a/encap/src/makeself-dist/makedist.sh
+++ b/encap/src/makeself-dist/makedist.sh
@@ -50,8 +50,8 @@ tar -cf $DISTDIR/epkg.tar $EPKGDIR/*
BCFG2="`basename $EPDIR/bcfg2-[0-9].[0-9]*-encap-*.tar.gz`"
BCFG2_ELEMENTTREE="`basename $EPDIR/bcfg2-elementtree-*-encap-*.tar.gz`"
BCFG2_PYTHON="`basename $EPDIR/bcfg2-python-[0-9].[0-9]*-encap-*.tar.gz`"
-DAEMONTOOLS="`basename $EPDIR/daemontools-[0-9].[0-9]*-encap-*.tar.gz`"
OSTIARTY="`basename $EPDIR/ostiary-[0-9].[0-9]*-encap-*.tar.gz`"
+RUNIT="`basename $EPDIR/runit-[0-9].[0-9]*-encap-*.tar.gz`"
BCFG2_PYTHON_APT_TMP="`basename $EPDIR/bcfg2-python-apt-*-encap-*.tar.gz`"
if [ "${BCFG2_PYTHON_APT_TMP}x" != 'bcfg2-python-apt-*-encap-*.tar.gzx' ]; then
@@ -60,7 +60,7 @@ fi
BCFG2DEPS="$BCFG2_ELEMENTTREE $BCFG2_PYTHON $BCFG2_PYTHON_APT"
-FILES="$BCFG2DEPS $BCFG2 $DAEMONTOOLS $OSTIARTY"
+FILES="$BCFG2DEPS $BCFG2 $RUNIT $OSTIARTY"
for FILE in ${FILES}; do
cp $EPDIR/$FILE $DISTDIR
@@ -106,7 +106,7 @@ if [ ! -h "$EPKG" -o ! -d "$ENCAPDIR/epkg-2.3.[89]" ]; then
fi
# Install everything else
-for LOC_PKG in $BCFG2DEPS $BCFG2 $DAEMONTOOLS $OSTIARTY $BCFG2_SITE; do
+for LOC_PKG in $BCFG2DEPS $BCFG2 $RUNIT $OSTIARTY $BCFG2_SITE; do
LOC_PKGSPEC="\`printf "%s\n" "\$LOC_PKG" | sed s:-encap.*::g\`"
if [ -d "$ENCAPDIR/\$LOC_PKGSPEC" ]; then
if [ "\${LOC_PKGSPEC}x" != "x" ]; then
@@ -237,13 +237,13 @@ chmod 600 \${LOC_BCFG2_CONF}*
chmod 600 \${LOC_OST_CFG}*
# Restart services if they exist to catch any config file changes
-if [ -x /command/svc -a -x /command/svstat ]; then
+if [ -x /usr/local/bin/sv ]; then
for LOC_SERVICE in bcfg2-client bcfg2-server ostiary; do
- if [ -h /service/\${LOC_SERVICE} ]; then
- printf "Restarting daemontools service \${LOC_SERVICE}...\n"
- /command/svc -t /service/\${LOC_SERVICE}
+ if [ -h /usr/local/var/service/\${LOC_SERVICE} ]; then
+ printf "Restarting runit service \${LOC_SERVICE}...\n"
+ /usr/local/bin/sv restart /usr/local/var/service/\${LOC_SERVICE}
sleep 2
- /command/svstat /service/\${LOC_SERVICE}
+ /usr/local/bin/sv status /usr/local/var/service/\${LOC_SERVICE}
fi
done
fi