[Devil-linux-commit] build/scripts nfs-utils,1.1.2.2,1.1.2.3

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26042

Modified Files:
      Tag: rel-1-2-patches
	nfs-utils 
Log Message:

- code clarifying


Index: nfs-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/nfs-utils,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- nfs-utils	13 Dec 2005 09:51:26 -0000	1.1.2.2
+++ nfs-utils	4 Nov 2007 17:41:15 -0000	1.1.2.3
@@ -26,43 +26,33 @@
 case $1 in
         build )
 		if [ "$CONFIG_NFSD" = "y" ]; then
-		./configure --prefix=$WORKDIR/tmp/usr --disable-nfsv4 --disable-gss || exit 1
-		make || exit 1
-	    fi
+		    ./configure --prefix=/usr --disable-nfsv4 --disable-gss || exit 1
+		    make || exit 1
+		    strip_debug
+	    	fi
                 ;;
 
         install )
 		if [ "$CONFIG_NFSD" = "y" ]; then
-	    	rm -rf $WORKDIR/tmp || exit 1
-		mkdir -p $WORKDIR/tmp || exit 1
-		make install || exit 1
-		if [ ! -d $CDDIR/var/lib/nfs ]; then mkdir -p $CDDIR/var/lib/nfs || exit 1 ; fi
-		    touch $CDDIR/var/lib/nfs/xtab; chmod 644 $CDDIR/var/lib/nfs/xtab
-		    touch $CDDIR/var/lib/nfs/etab; chmod 644 $CDDIR/var/lib/nfs/etab
-		    touch $CDDIR/var/lib/nfs/rmtab; chmod 644 $CDDIR/var/lib/nfs/rmtab
-		    mkdir -p $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak
-		    touch $CDDIR/var/lib/nfs/state
-		    chmod go-rwx $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak $CDDIR/var/lib/nfs/state
-		    chown nobody $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak $CDDIR/var/lib/nfs/state
-	    
-		    copy_docs $WORKDIR/tmp
-		    cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
-		    rm -rf $WORKDIR/tmp || exit 1
-		    cp -p /etc/rpc $ETCDIR/etc/ || exit 1
-		    cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF
+	    	rm -rf $TMPDIR || exit 1
+		mkdir -p $TMPDIR || exit 1
+		make install DESTDIR=$CDDIR || exit 1
+		rm -rf $TMPDIR || exit 1
+		cp -p /etc/rpc $ETCDIR/etc/ || exit 1
+		cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF
 		    PORT="2049"
 		    PROCESSES="8"
 		    QUOTAS="no"
 		    KILLDELAY="10"
-EOF
-		    touch $ETCDIR/etc/exports || exit 1
+		EOF
+		touch $ETCDIR/etc/exports || exit 1
 	
-		    cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1
+		cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1
 		
-	    echo "# Start NFS server?" >> $CONFIGFILE
-	    echo "START_NFSD=no" >> $CONFIGFILE
-	    echo >> $CONFIGFILE
-	    echo "HELP_NFSD=\"NFSD is Network File System v3 Server"
+		echo "# Start NFS server?" >> $CONFIGFILE
+		echo "START_NFSD=no" >> $CONFIGFILE
+		echo >> $CONFIGFILE
+		echo "HELP_NFSD=\"NFSD is Network File System v4(3,2) Server"
 		
 		fi	
 		;;