diff options
| author |   Eric Thibodeau <kyron@neuralbs.com> | 2008-10-20 15:36:20 -0400 |
|---|---|---|
| committer | Eric Thibodeau <kyron@neuralbs.com> | 2008-10-20 15:36:20 -0400 |
| commit | d181cc17c0c7a4adf6c4c2fbd6bcd2b4a67dd643 (patch) | |
| tree | f300851103994d277d4674c12e7ff2e36dfeb3c0 | |
| parent | LiveCD-HOWTO: Documentation update to reflect latest portage changes (diff) | |
| download | clustering-livecd-d181cc17c0c7a4adf6c4c2fbd6bcd2b4a67dd643.tar.gz clustering-livecd-d181cc17c0c7a4adf6c4c2fbd6bcd2b4a67dd643.tar.bz2 clustering-livecd-d181cc17c0c7a4adf6c4c2fbd6bcd2b4a67dd643.zip | |
Added call to torque's confi within beowulf-head if USE=-livecd (ie: not in catalyst)
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | overlay/sys-cluster/beowulf-head/Manifest | 2 | ||||
| -rw-r--r-- | overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild | 11 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,7 @@ +General: +_config files_ +The domaine name is set in both files, this might cause weird problems if not set to identical values. This also means we're doing something incorrect ans out config file approach is flawed (duplication of information, things _will_ go wrong). + beowulf-head ebuild: The beowulf-head ebild requires that the NFS bootable image exists in /tftproot/nfsroot/$ARCH prior to calling pkg_config. Currently, this folder is populated thanks to the following sequence: diff --git a/overlay/sys-cluster/beowulf-head/Manifest b/overlay/sys-cluster/beowulf-head/Manifest index 0c6e805..e188fa8 100644 --- a/overlay/sys-cluster/beowulf-head/Manifest +++ b/overlay/sys-cluster/beowulf-head/Manifest @@ -6,5 +6,5 @@ AUX node-manager 2119 RMD160 9cb7ffdd91c0bc699abf59b87bf5894157001ad1 SHA1 cd0c6 AUX setup-pwdless-ssh 819 RMD160 418271742cb1046efebd2ad4ef2d3e99845142ba SHA1 d06002173fec53bb46f6f5ff6dd30a0ed2e74bfb SHA256 6a6ac28a8c5c9e32d5544ea0c18afe43fa96456c4a52d5f4849cd5f4527aa766 AUX torque-add 629 RMD160 79040160b992cfefde964fc6511022e029c1b58a SHA1 324d4b0cb5071aaf3a6c62d01bb613cdf8ecf901 SHA256 5d3d4c3ab35923632b81eaf48d64d6cba1060d0a1887fbc85e8adf10b7fc52c9 AUX torque-del 132 RMD160 bc1e0a9ccc6ce20630003f7372d62bdb705b9187 SHA1 c735f03fb6715ab601cb84f4fbc92be78ce43575 SHA256 c455764846f192930625721958532d3cee64aa75d9d83a37b67544e4c7bdee64 -EBUILD beowulf-head-0.1.ebuild 7580 RMD160 b83055eb4e3a920ef3616f558c3e2539491527fa SHA1 8bab93c6d6b4a92f39b830416c5f4811ab535842 SHA256 697583a5b594885fbe3f6a7283905c8e7d610066371e9e60471ecc88279d60b8 +EBUILD beowulf-head-0.1.ebuild 7691 RMD160 70eea91df56f07a7cc1bd8f95cf4e8a0ac7c1c72 SHA1 fa037963e48069c33d3bc7e205122405aa5e1859 SHA256 d6c25623ab894f4ca4c667968ff4ffd7c18f0dc9beaa24b3c1eaf588877c0e6b MISC ChangeLog 101 RMD160 d735719ccc09237e68e4e984eb5451000b06c382 SHA1 79098d1e8ae451f0430d363da6b717966ade6e78 SHA256 8dd010e2772026c4a6b86839842931b99c85c44a5e9f380864cc275b55587ac2 diff --git a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild index f1c89eb..9871007 100644 --- a/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild +++ b/overlay/sys-cluster/beowulf-head/beowulf-head-0.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="autofs nonfsv4 beep pbs" +IUSE="livecd autofs nonfsv4 beep pbs" DEPEND="" RDEPEND="net-nds/ldap-auth @@ -187,7 +187,7 @@ nfs_exports_conf() resolv_conf() { - cat >> /etc/resolvconf/resolv.conf.d/base <<-EOF + cat > /etc/resolvconf/resolv.conf.d/base <<-EOF search $LOCALDOMAINNAME nameserver 127.0.0.1 EOF @@ -262,7 +262,12 @@ pkg_config() pxe_conf nfs_exports_conf - use pbs && TORQUED="pbs_server pbs_sched" + if use pbs; then + TORQUED="pbs_server pbs_sched" + # we don't want to call --config in a catalyst build + ! use livecd emerge --config torque + fi + for I in dnsmasq netmount nfs $TORQUED do rc-update add $I default |