From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 27 Jan 2010 18:44:46 +0000 (+0000)
Subject: fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec... 
X-Git-Tag: BootManager-5.0-1^2~2
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=de55450d9707b318aabf5b1caa542259e76a4eb9

fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodeconfig/yum
  now known as the nodeyum package
  (might need some moer work for properly handling kexcludes in multi-fc plcs)
cleaned up all uses of /etc/planetlab/{node,slice}family
nodeconfig now does not need the build/ module anymore at build time
---

diff --git a/README b/README
index a214887..f86a201 100644
--- a/README
+++ b/README
@@ -42,8 +42,16 @@ https://.../boot/bootstrafs-<deployment>.tar.bz2
 https://.../boot/bootstrafs-<nodefamily>.tar.bz2
 
 * as far as extensions, we fetch
-https://.../boot/bootstrafs-<extension>-<arch>.tar.bz2
+https://.../boot/bootstrafs-<extension>-<fcdistro>-<arch>.tar.bz2
   for all defined extensions
 
 * also if the plainbootstrapfs tag is set, then the uncompressed files
   are fetched
+
+======================================== yum repo
+
+* if the node has the 'deployment' tag set, then we use
+http://.../install-rpms/alpha
+
+* otherwise 
+http://.../install-rpms/<nodefamily>
diff --git a/bootmanager.spec b/bootmanager.spec
index f6d55f4..460b86d 100644
--- a/bootmanager.spec
+++ b/bootmanager.spec
@@ -25,6 +25,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 
 Requires: tar, gnupg, sharutils, bzip2, pypcilib
+# need the apache user at install-time
+Requires: httpd 
+
 Requires: PLCAPI >= 5.0
 # the python code packaged in these are shipped on the node as well
 Requires: pypcilib pyplnet monitor-runlevelagent
@@ -68,8 +71,10 @@ install -D -m 755 plc.d/bootmanager $RPM_BUILD_ROOT/etc/plc.d/bootmanager
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# signing of botmanager.sh occurs as part of /etc/plc.d/bootmanager
-# which in turn invokes build.sh
+# initialize the boot manager upload area
+mkdir -p /var/log/bm
+chown apache:apache /var/log/bm
+chmod 700 /var/log/bm
 
 # NOTE: do not run this agent when installed on a myplc.
 # xxx - a bit hacky maybe
diff --git a/plc.d/bootmanager b/plc.d/bootmanager
index 19b6e03..4c7b86d 100755
--- a/plc.d/bootmanager
+++ b/plc.d/bootmanager
@@ -29,13 +29,17 @@ case "$1" in
 	    [ -d "$topdir" ] || continue
 	    deployment=$(basename $topdir)
 	    if [ "$deployment" = "regular" ] ; then
-		dialog $"Rebuilding Boot Manager"
+		action $"Rebuilding Boot Manager"
 		$topdir/build.sh regular
 		check
-	    else
-		dialog $"Rebuilding Boot Manager for deployment $deployment"
+	    elif [ -x $topdir/build.sh ] ; then
+		action $"Rebuilding Boot Manager for deployment $deployment"
 		$topdir/build.sh $deployment
 		check
+	    elif [ "$deployment" == "source" ] ; then
+		action $"Ignoring obsolete dir, please cleanup" "$topdir"
+	    else
+		action $"WARNING: missing build.sh script in" "$topdir"
 	    fi
 	done