[Lunar-commits] r25260 - in moonbase/trunk/filesys/openafs: . init.d

[Stefan Wold]

Author: ratler
Date: 2007-07-25 11:43:29 +0200 (Wed, 25 Jul 2007)
New Revision: 25260

Modified:
   moonbase/trunk/filesys/openafs/BUILD
   moonbase/trunk/filesys/openafs/DETAILS
   moonbase/trunk/filesys/openafs/init.d/afs
Log:
More changes since the FHS layout change. Server part of afs should now be working correctly. Also renamed files colliding with other modules.

Modified: moonbase/trunk/filesys/openafs/BUILD
===================================================================
--- moonbase/trunk/filesys/openafs/BUILD	2007-07-25 09:17:11 UTC (rev 25259)
+++ moonbase/trunk/filesys/openafs/BUILD	2007-07-25 09:43:29 UTC (rev 25260)
@@ -1,5 +1,7 @@
 (
   patch_it $SOURCE4 1	&&
+  patch_it $SOURCE5 1	&&
+  patch_it $SOURCE6 0   &&
   ./regen.sh		&& 
 
   case `uname -r` in
@@ -13,7 +15,7 @@
       message "Unsupported kernel version!"
       exit -1
       ;;
-  esac
+  esac &&
 
   case `arch` in
     x86_64)
@@ -25,7 +27,7 @@
     *)
       OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
       ;;
-  esac
+  esac &&
 
   if module_installed Linux-PAM; then
       OPTS+=" --enable-pam"
@@ -35,6 +37,7 @@
 	
   ./configure 	--prefix=/usr			\
 		--sysconfdir=/etc	        \
+		--localstatedir=/var/lib        \
 		--infodir=/usr/share/info	\
 		--mandir=/usr/share/man		\
 		--enable-largefile-fileserver   \
@@ -55,13 +58,22 @@
  	chmod 0700 /var/cache/openafs
   fi &&	
 
+  # Server dirs
+  if [ ! -d /var/lib/openafs ]; then
+  	mkdir -p /var/lib/openafs/{logs,db}
+	chmod 700 /var/lib/openafs/db
+	chmod 755 /var/lib/openafs/logs
+  fi &&
+
   if [ ! -d /afs ]; then
   	mkdir /afs &&
 	chmod 755 /afs
   fi &&	
 
   # Installing some db files
-  install -p -m 644 $SOURCE_CACHE/CellServDB /etc/openafs/CellServDB &&
+  if [ ! -f /etc/openafs/CellServDB ]; then
+  	install -p -m 644 $SOURCE_CACHE/CellServDB /etc/openafs/CellServDB
+  fi &&
   install -p -m 755 $SOURCE_CACHE/$SOURCE3 /usr/sbin/killafs &&
   touch /etc/openafs/SuidCells &&
 

Modified: moonbase/trunk/filesys/openafs/DETAILS
===================================================================
--- moonbase/trunk/filesys/openafs/DETAILS	2007-07-25 09:17:11 UTC (rev 25259)
+++ moonbase/trunk/filesys/openafs/DETAILS	2007-07-25 09:43:29 UTC (rev 25260)
@@ -4,16 +4,22 @@
        SOURCE2=CellServDB
        SOURCE3=killafs-0.1
        SOURCE4=openafs-1.4.1-rename_pagsh.patch
+       SOURCE5=openafs-1.4.4-rename_kpasswd.patch
+       SOURCE6=openafs-1.4.4-fixes.patch
     SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION/
    SOURCE2_URL=http://grand.central.org/dl/cellservdb/
    SOURCE3_URL=$PATCH_URL/
    SOURCE4_URL=$PATCH_URL/
+   SOURCE5_URL=$PATCH_URL/
+   SOURCE6_URL=$PATCH_URL/
       WEB_SITE=http://www.openafs.org/
     SOURCE_VFY=sha1:07c2854d97fab807ee023c281ec7203f1e9ef723
    SOURCE3_VFY=sha1:5532084c54a79f77807ee8ae3cb09018b3e74c12
    SOURCE4_VFY=sha1:401b3ada4f9a2a60cd0f6ac60f7107f1fdca0638
+   SOURCE5_VFY=sha1:bb752d2520391ad3a58f46c364e189f9f398fb1f
+   SOURCE6_VFY=sha1:3a24d608b86bcf8155ef67a403c2bc831a0f9f52
        ENTERED=20031216
-       UPDATED=20070329
+       UPDATED=20070725
     MAINTAINER="ratler at lunar-linux.org"
          SHORT="A distributed filesystem"
 PSAFE=no

Modified: moonbase/trunk/filesys/openafs/init.d/afs
===================================================================
--- moonbase/trunk/filesys/openafs/init.d/afs	2007-07-25 09:17:11 UTC (rev 25259)
+++ moonbase/trunk/filesys/openafs/init.d/afs	2007-07-25 09:43:29 UTC (rev 25260)
@@ -88,7 +88,7 @@
     # Start bosserver, it if exists
     if is_on $AFS_SERVER && test -x /usr/sbin/bosserver  ; then
 	echo -n "Starting AFS server: "
-	/usr/sbin/bosserver -nofork ${BOSSERVER_OPTIONS} &&
+	/usr/sbin/bosserver -nofork ${BOSSERVER_OPTIONS} &
 	echo -e $RESULT_OK || echo -e $RESULT_FAIL
 	if is_on $WAIT_FOR_SALVAGE; then
             # wait for fileserver to finish salvaging
@@ -102,7 +102,7 @@
     
     # Start AFS client
     if is_on $AFS_CLIENT && test -x /usr/sbin/afsd  ; then
-	echo -n "Starting  AFS client: "
+	echo -n "Starting AFS client: "
 	choose_afsdoptions
 	/usr/sbin/afsd ${AFSD_OPTIONS} &&
 	echo -e $RESULT_OK || echo -e $RESULT_FAIL