diff options
author | Sébastien Fabbro <bicatali@gentoo.org> | 2010-06-22 19:11:22 +0100 |
---|---|---|
committer | Sébastien Fabbro <bicatali@gentoo.org> | 2010-06-22 19:11:22 +0100 |
commit | be3bfe418026f8ec531fefe18ca4c10cc5b6d140 (patch) | |
tree | 0186e22fbb29d0ec30893f1674f954ac4c05e466 | |
parent | remanifesting (diff) | |
download | sci-be3bfe418026f8ec531fefe18ca4c10cc5b6d140.tar.gz sci-be3bfe418026f8ec531fefe18ca4c10cc5b6d140.tar.bz2 sci-be3bfe418026f8ec531fefe18ca4c10cc5b6d140.zip |
condor: more initd fixes, now local config will reside in /var/lib
-rw-r--r-- | sys-cluster/condor/ChangeLog | 4 | ||||
-rw-r--r-- | sys-cluster/condor/Manifest | 6 | ||||
-rw-r--r-- | sys-cluster/condor/condor-7.5.2.ebuild | 4 | ||||
-rw-r--r-- | sys-cluster/condor/files/condor.initd | 37 |
4 files changed, 41 insertions, 10 deletions
diff --git a/sys-cluster/condor/ChangeLog b/sys-cluster/condor/ChangeLog index f8acae485..c553548c0 100644 --- a/sys-cluster/condor/ChangeLog +++ b/sys-cluster/condor/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> condor-7.5.2.ebuild, + files/condor.initd: + More initd fixes, now local config will reside in /var/lib + *condor-7.5.2 (21 Jun 2010) 21 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> -condor-7.4.1.ebuild, diff --git a/sys-cluster/condor/Manifest b/sys-cluster/condor/Manifest index 28361fdc8..331d9aa6b 100644 --- a/sys-cluster/condor/Manifest +++ b/sys-cluster/condor/Manifest @@ -1,7 +1,7 @@ AUX condor.confd 75 RMD160 a58d37af4bbbcf1df486dd1397209832114cb614 SHA1 fcc784f7af690943b215b97ebbc8f4a199f16fb4 SHA256 ee7d67f176996412d4de8b76b5720ef5c4da84eebe119ed1b4ad52ae8528eb30 -AUX condor.initd 1011 RMD160 02d8c12e41372c79da05df9dd5e253b94351325d SHA1 96b5fda3ceccedc2f610594beff6b26dfed085b1 SHA256 769e94bc510e9db28ccc9de4b64b7fbcb9d359fff16da736f3e5dac01f38aa42 +AUX condor.initd 1756 RMD160 f632a6f2d1fc554fa966ee141232188cf1a5ca8b SHA1 90b175120fe94ac7d77ab320f6264f92fbf0c850 SHA256 7b8e44747882f9c89fff53c1bed8f36f8b9dbcc16e3d13adbaba43e57ee79c78 AUX condor_config.local 273 RMD160 5aa8e9b62d57059667aac9f2c583cf3f2490b603 SHA1 d53d14ce4fb79510ae267ad6070f0bf6e42e0db1 SHA256 849985bc53bb39c464c55e30a8ae5b7d33e90b2ccee8337452b17bf87edc0b1f DIST condor_src-7.5.2-all-all.tar.gz 21705891 RMD160 f9911e3a44b69bb22ef607964aec726b51ab9341 SHA1 7e85048545423b13f8173c6ba6d76d35b97f2dcc SHA256 1a4fc437541896aa9963f12ec9231495f6a5ab4cc5ca814b57755a38db407026 -EBUILD condor-7.5.2.ebuild 4035 RMD160 c37e5204e5a343bf71dee875fc1f6c9f8d9bffac SHA1 f65ee1ac5831da934e441d571e3ebabd010d6533 SHA256 50b61f0b7764d38df85679cd7f4ca9d8c4e6bd835fd6b954d879707addeb8480 -MISC ChangeLog 1301 RMD160 4339d92f37449154060d523bd14da5dc5c33e93f SHA1 993e777925e30e994217b858b763ec863975caaf SHA256 dd56e25b72d79e8ce606bddd7ab69eda10f118460759410b908ab84ed52f4c6d +EBUILD condor-7.5.2.ebuild 4255 RMD160 8fb8db3fb404975463cb8166009d8c651f5732d3 SHA1 9c67bc4f5de9cb03923f0aeaaff64d7b38bb6cf7 SHA256 1d0c74e4d33a2816d07ebe3de95de06e683acffedb12d5e3745a75fc60ecf9d5 +MISC ChangeLog 1461 RMD160 ca2724f6861e01ee441de87906846e34e7b36b25 SHA1 3a0577bcdbf180b5f80e02067548c1be2cc709be SHA256 7c52b89de1c861e71b16f3f974bcb3d70baa8cebceee9b74f4cf33eae9d6e726 MISC metadata.xml 1247 RMD160 bcc91575dc0a5cc4ac255d5c0c415d0ade7c96c4 SHA1 a9a3ca65688dc4f32a01df1a5c329065fc7b37bf SHA256 87fdc2d2b126339048785a67fa126a184ffdf08a6bf6e6e29e78c62581ca1f0f diff --git a/sys-cluster/condor/condor-7.5.2.ebuild b/sys-cluster/condor/condor-7.5.2.ebuild index 1218d588b..1574e7e75 100644 --- a/sys-cluster/condor/condor-7.5.2.ebuild +++ b/sys-cluster/condor/condor-7.5.2.ebuild @@ -49,6 +49,10 @@ src_prepare() { # this patch is mostly to use standard fhs cd condor_examples epatch ./condor_config.generic.rpm.patch + # the base local file is in /etc, then the condor local file is updated and should reside in /var/lib + sed -i \ + -e 's/\(LOCAL_CONFIG_FILE.*=\).*/\1/var/lib/condor/condor_config.local' \ + condor_config.generic || die } src_configure() { diff --git a/sys-cluster/condor/files/condor.initd b/sys-cluster/condor/files/condor.initd index e653c9c01..cb50808aa 100644 --- a/sys-cluster/condor/files/condor.initd +++ b/sys-cluster/condor/files/condor.initd @@ -15,23 +15,46 @@ depend() { use logger } -start() { - ebegin "Starting condor" +setup_central_manager() { # delete current condor host, replace it with central manager - sed -i \ - -e '/CONDOR_HOST/d/' \ + sed -e '/CONDOR_HOST/d' \ -e "\$aCONDOR_HOST=${CONDOR_CENTRAL_MANAGER}" \ - ${CONDOR_CONFIG_LOCAL} + /etc/condor/condor_config.local > ${CONDOR_CONFIG_LOCAL} + chown ${CONDOR_USER}:${CONDOR_USER} ${CONDOR_CONFIG_LOCAL} +} + +# set up condor ccb if only private networking is available (assumes ifconfig) +setup_ccb() { + /sbin/ifconfig | grep "inet addr" | egrep -v "addr:127.|addr:192.|addr:172.|addr:10." > /dev/null + retval=$? + if [ ${retval} -ne 0 ]; then # all addresses are local + echo \ + "$(/sbin/ifconfig | grep "inet addr" | grep -v 127. | awk '{print $2}' | sed s/addr://)" \ + "$(hostname)" \ + "# Added for Condor CCB" \ + >> /etc/hosts + fi +} + +cleanup_ccb() { + sed -i '/# Added for Condor CCB/d' /etc/hosts +} - pid=$(start-stop-daemon --start --quiet --user ${CONDOR_USER} \ +start() { + ebegin "Starting condor" + setup_central_manager + setup_ccb + start-stop-daemon --start --quiet --user ${CONDOR_USER} \ --pidfile ${CONDOR_RUN}/condor.pid \ - --exec ${CONDOR_MASTER} -- ${CONDOR_OPTS}) + --exec ${CONDOR_MASTER} -- ${CONDOR_OPTS} retval=$? + [ $retval -eq 0 ] && touch /var/lock/subsys/condor eend ${retval} } stop() { ebegin "Stopping condor" + cleanup_ccb start-stop-daemon --stop --quiet \ --pidfile ${CONDOR_RUN}/condor.pid \ --exec ${CONDOR_MASTER} |