[Devil-linux-commit] build/scripts shorewall,1.6,1.6.2.1

[Heiko Z. <smi...@us...>]

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

Modified Files:
      Tag: rel-1-2-patches
	shorewall 
Log Message:
- moved file /usr/share/shorewall/modules to /etc/shorewall
- updated shorewall to 3.4.2


Index: shorewall
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shorewall,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- shorewall	3 May 2004 18:12:01 -0000	1.6
+++ shorewall	19 Apr 2007 14:41:22 -0000	1.6.2.1
@@ -31,11 +31,11 @@
 
 	install )
 		if [ "$CONFIG_SHOREWALL" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR || exit 1
 			
-			# Install shorewall into $WORKDIR/tmp
-			PREFIX=$WORKDIR/tmp ./install.sh || exit 1
+			# Install shorewall into $TMPDIR
+			PREFIX=$TMPDIR ./install.sh || exit 1
 
 			# Create the directories for /var
 			mkdir -p $CDDIR/var/lib/shorewall
@@ -43,9 +43,11 @@
 			chmod 644 $CDDIR/var/log/messages
 			
 			# Copy all the shorewall files to the appropriate directories on the cd
-			copy_files $WORKDIR/tmp/sbin $CDDIR || exit 1
-			copy_files $WORKDIR/tmp/usr/share/shorewall $CDDIR/usr/share || exit 1
-			copy_files $WORKDIR/tmp/etc/shorewall $ETCDIR/etc || exit 1
+			copy_files $TMPDIR/sbin $CDDIR || exit 1
+			copy_files $TMPDIR/usr/share/shorewall $CDDIR/usr/share || exit 1
+			copy_files $TMPDIR/etc/shorewall $ETCDIR/etc || exit 1
+			mv $CDDIR/usr/share/shorewall/modules $ETCDIR/etc/shorewall/ || exit 1
+			ln -sf /etc/shorewall/modules $CDDIR/usr/share/shorewall/modules || exit 1
 
 			# Copy the shorewall documentation onto the cd
 			# never versions don't seem to have the documentation included anymore
@@ -55,7 +57,7 @@
 
 			# Copy our own startup script into /etc/init.d
 			cp $MYDIR/scripts/shorewall $ETCDIR/etc/init.d/
- 			rm -rf $WORKDIR/tmp || exit 1
+ 			rm -rf $TMPDIR || exit 1
 
 			# Create the shorewall option in the config file
 			echo "# Start $MYNAME?" >> $CONFIGFILE