[Devil-linux-commit] build/scripts nfs-utils,NONE,1.1.2.1 prepare,1.46,1.46.2.1 ucarp,1.1.2.4,1.1.2.5

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

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

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

added "||exit 1" condition to ucarp
added kernel nfsd v3


Index: ucarp
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/Attic/ucarp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- ucarp	2 Oct 2005 08:03:53 -0000	1.1.2.4
+++ ucarp	2 Oct 2005 11:25:28 -0000	1.1.2.5
@@ -25,20 +25,20 @@
 
 case $1 in
         build )
-		if [ "$CONFIG_UCARP" = "y" ]; then
-                ./configure
-				make
-		fi
-                ;;
+	    if [ "$CONFIG_UCARP" = "y" ]; then
+        	./configure || exit 1
+		make || exit 1
+	    fi
+            ;;
 
         install )
-		if [ "$CONFIG_UCARP" = "y" ]; then
-			cp src/ucarp $CDDIR/usr/bin/ || exit 1
-		fi
-                ;;
+	    if [ "$CONFIG_UCARP" = "y" ]; then
+		cp src/ucarp $CDDIR/usr/bin/ || exit 1
+	    fi
+            ;;
         * )
-		echo "ERROR ($0)"
-		echo "please add parameter so I know what to do"
-		exit 1
-		;;
+	    echo "ERROR ($0)"
+	    echo "please add parameter so I know what to do"
+	    exit 1
+	    ;;
 esac

--- NEW FILE: nfs-utils ---
#!/bin/bash
# : /cvsroot/devil-linux/build/scripts/nfs-utils,v $
# : 1.2 $
# : 2005/01/11 14:43:04 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       nfs-utils
# Required-Start:  $basebuildtools $libs
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
        build )
	    if [ "$CONFIG_NFS" = "y" ]; then
		./configure --prefix=$WORKDIR/tmp/usr --disable-nfsv4 --disable-gss || exit 1
		make || exit 1
	    fi
                ;;

        install )
	    if [ "$CONFIG_NFS" = "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
		    PORT="2049"
		    PROCESSES="8"
		    QUOTAS="no"
		    KILLDELAY="10"
EOF
		    touch $ETCDIR/etc/exports || 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"
		
		fi	
		;;
        * )
			echo "ERROR ($0)"
			echo "please add parameter so I know what to do"
			exit 1
			;;
esac

Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.46
retrieving revision 1.46.2.1
diff -u -d -r1.46 -r1.46.2.1
--- prepare	4 May 2004 01:04:57 -0000	1.46
+++ prepare	2 Oct 2005 11:25:28 -0000	1.46.2.1
@@ -111,6 +111,10 @@
 		cat $KERNEL_CONFIG_DIR/config_linux.alsa >> $KERNELDIR/.config || exit 1
 	fi
 
+	if [ "$CONFIG_NFS" == "y" ]; then
+		cat $KERNEL_CONFIG_DIR/config_linux.nfs >> $KERNELDIR/.config || exit 1
+	fi
+
 	pushd $KERNELDIR > /dev/null
 
 	if [ ! -f devil-linux-kernel-patches.done ]; then