From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Sun, 28 May 2006 20:17:11 +0000 (+0000)
Subject: More spec/startup fixes
X-Git-Tag: connpool_branch_start~33
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=76beb4eb6c498b301d173df6143137615fb9fba2;p=jra1mw.git

More spec/startup fixes
---

diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES
index c07202b..615ec96 100644
--- a/org.gridsite.core/CHANGES
+++ b/org.gridsite.core/CHANGES
@@ -1,3 +1,6 @@
+* Sun May 26 2006 Andrew McNab <Andrew.McNab@man.ac.uk>
+- Include SlashGrid code, and in gridsite.spec etc
+- Add sample fuse.spec to docs for use with SlashGrid
 * Fri May 26 2006 Andrew McNab <Andrew.McNab@man.ac.uk>
 - ==== GridSite version 1.3.0 ====
 * Mon Apr 24 2006 Andrew McNab <Andrew.McNab@man.ac.uk>
diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec
index a177497..28ef43a 100644
--- a/org.gridsite.core/src/gridsite.spec
+++ b/org.gridsite.core/src/gridsite.spec
@@ -86,9 +86,12 @@ OPENSSL_LIBS=$OPENSSL_LIBS FLAVOR_EXT=$FLAVOR_EXT
 
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 
-if [ -f xxx/usr/include/fuse/fuse.h ] ; then
+if [ -f /usr/include/fuse/fuse.h ] ; then
  cp -f slashgrid      $RPM_BUILD_ROOT/%{prefix}/sbin/slashgrid
  cp -f slashgrid.init $RPM_BUILD_ROOT/etc/rc.d/init.d/slashgrid
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/headers
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/blocks
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/tmp
 else
  echo -e '#!/bin/sh\necho SlashGrid wasnt built since no fuse-devel on build machine)' \
    >$RPM_BUILD_ROOT/%{prefix}/sbin/slashgrid
@@ -158,6 +161,13 @@ Summary: slashgrid daemon
 %description slashgrid
 SlashGrid daemon
 
+%post slashgrid
+mkdir -p /grid
+
+%preun slashgrid
+/sbin/service slashgrid stop
+
 %files slashgrid
 %attr(0744, root, root) %{prefix}/sbin/slashgrid
 %attr(0744, root, root) /etc/rc.d/init.d/slashgrid
+%attr(0700, root, root) /var/spool/slashgrid