diff options
| author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-25 22:15:42 +0000 |
|---|---|---|
| committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2006-08-25 22:15:42 +0000 |
| commit | 2a9fae783f391af23055a9d4491812e3a13ca684 (patch) | |
| tree | 7274c635a1c11fc2cb4fb4c0a19427c5a42d29af /encap/src | |
| parent | a0a3762c9f5714e341df7b9417cb62223216f7ee (diff) | |
| download | bcfg2-2a9fae783f391af23055a9d4491812e3a13ca684.tar.gz bcfg2-2a9fae783f391af23055a9d4491812e3a13ca684.tar.bz2 bcfg2-2a9fae783f391af23055a9d4491812e3a13ca684.zip | |
EncapPackages: Run bcfg2-site install as part of all since it (should be)
convergant; also start up ostiary service if it hasn't already been started.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2115 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/src')
| -rw-r--r-- | encap/src/bcfg2-site/Makefile | 2 | ||||
| -rwxr-xr-x | encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/encap/src/bcfg2-site/Makefile b/encap/src/bcfg2-site/Makefile index 52b688a13..3f6547e7c 100644 --- a/encap/src/bcfg2-site/Makefile +++ b/encap/src/bcfg2-site/Makefile @@ -14,7 +14,7 @@ BD = /usr/local ED = ${BD}/encap export ED -all : encap +all : encap install clean : for DIR in `find . -type d | grep -v "\.svn"`; do \ diff --git a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl index a02c265cb..8a20a968d 100755 --- a/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl +++ b/encap/src/bcfg2-site/bcfg2-site-RENAME/postinstall.tmpl @@ -81,6 +81,17 @@ else touch ${BASEDIR}/sbin/.SENTINEL_SITE fi +if [ ! -h /service/ostiary ]; then + if [ -d /usr/local/var/svc.d/ostiary ]; then + ln -s /usr/local/var/svc.d/ostiary /service/ostiary + else + printf "ERROR: /usr/local/var/svc.d/ostiary does not exist.\n" + exit 1 + fi +else + printf "INFO: /service/ostiary already exists, not replacing...\n" +fi + //if int(@BCFG2_CLIENT_RUN_INTERVAL_SECONDS) > 0 if [ ! -h /service/bcfg2-client ]; then if [ -d /usr/local/var/svc.d/bcfg2-client ]; then |