[Devil-linux-commit] build/scripts patch-o-matic,1.22.2.4,1.22.2.5

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

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

Modified Files:
      Tag: rel-1-2-patches
	patch-o-matic 
Log Message:

- added patch for using L7 and CONNMARK together


Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -d -r1.22.2.4 -r1.22.2.5
--- patch-o-matic	20 Dec 2005 01:46:32 -0000	1.22.2.4
+++ patch-o-matic	13 Mar 2006 14:58:41 -0000	1.22.2.5
@@ -52,7 +52,12 @@
 		do
 		    tar -vxjf $FILE -C patchlets || exit 1
 		done
-	    												
+
+	    	#Patch for using L7 and CONNMARK together	
+		if [ "$CONFIG_NF_LAYER7" = "y" ]; then
+		    tar -vxjf  $DL_DIR/src/pom-addon/CONNMARK_L7.tar.bz2 -C patchlets || exit 1		
+		fi
+		
 		# update the patch-o-matic.exclude file to make sure we have everything listed in there
 		for PDIR in $(ls -d -1 *); do
 			if [ -d "$PDIR" ]; then