Update of /cvsroot/ssic-linux/openssi/specs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1913/specs
Modified Files:
Tag: OPENSSI-RH
nfs-utils.spec
Log Message:
Improved NFS server support
specs/nfs-utils.spec
Makefile
nfs-utils.more/SSInfs.init (NEW)
nfs-utils.more/nfs.init
Disable nfs service unless called from SSInfs
Add new SSInfs which starts nfs service when no nodes in COMINGUP
distro-pkgs/redhat/initscripts/rc.d/rc.sysrecover
distro-pkgs/redhat/initscripts/rc.d/rc.nodedown
Move failover of services to nodedown after filesystem failover
openssi-tools/distro/redhat/ha-lvs.init
distro-pkgs/redhat/initscripts/rc.d/rc.sysinit
Keep current initnode number in /cluster/initnode
Clear /cluster/RECOVERY flag
Clear /etc/lvs.VIP>active to LVS director can be initnode
kernel/cluster/ssi/cfs/cfs_chard.c
New function cfs_inode_is_chard() for NFS export
kernel/cluster/ssi/cfs/cfsproc.c
Fix cfsd_proc_getinode_0() to handle case of no svrcfstok in memory
kernel/cluster/ssi/cfs/proc.c
kernel/cluster/ssi/cfs/inode.c
Fix NFS file handles not to include ssidev (since they change)
Fix missing dput()/iput() in cfs_proc_getinode()
kernel/fs/nfsd/export.c
Require CFS chard mounts to have fsid= in exports
kernel/include/linux/fs.h
Move FS_CFS/FS_CLUSTER_MAP so don't conflict with FS_NFSEXP_FSID from
the lustre patch
ChangeLog
Update
Index: nfs-utils.spec
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/specs/nfs-utils.spec,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- nfs-utils.spec 25 Mar 2004 08:47:43 -0000 1.1.2.8
+++ nfs-utils.spec 26 Mar 2004 05:44:02 -0000 1.1.2.9
@@ -6,6 +6,7 @@
Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
Source10: nfs.init
Source11: nfslock.init
+Source12: SSInfs.init
Patch0: nfs-utils-0.3.3.drop-privs.patch
Patch1: nfs-utils-0.2beta-nowrap.patch
Patch2: no-chroot.patch
@@ -73,6 +74,7 @@
install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
+install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/SSInfs
touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
mv $RPM_BUILD_ROOT/usr/sbin/{rpc.lockd,rpc.statd} $RPM_BUILD_ROOT/sbin
@@ -100,11 +102,18 @@
%post
/sbin/chkconfig --add nfs
/sbin/chkconfig --add nfslock
+/sbin/chkconfig --add SSInfs
+# Enable SSInfs if standard nfs service is already enabled
+if /sbin/chkconfig --list nfs | grep -q on
+then
+ /sbin/chkconfig SSInfs on
+fi
%preun
if [ "$1" = "0" ]; then
/sbin/chkconfig --del nfs
/sbin/chkconfig --del nfslock
+ /sbin/chkconfig --del SSInfs
/usr/sbin/userdel rpcuser 2>/dev/null || :
/usr/sbin/groupdel rpcuser 2>/dev/null || :
/usr/sbin/userdel nfsnobody 2>/dev/null || :
@@ -112,9 +121,11 @@
%triggerpostun -- nfs-server
/sbin/chkconfig --add nfs
+/sbin/chkconfig --add SSInfs
%triggerpostun -- knfsd
/sbin/chkconfig --add nfs
+/sbin/chkconfig --add SSInfs
%triggerpostun -- knfsd-clients
/sbin/chkconfig --add nfslock
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
|
|