[Devil-linux-commit] build/scripts ntop,1.7,1.8 syslinux,1.18,1.19

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

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

Modified Files:
	ntop syslinux 
Log Message:
- ntop database path is now configurable
- updated zisofs-tools to v1.06
- updated syslinux to v3.07


Index: syslinux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/syslinux,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- syslinux	31 May 2004 14:23:21 -0000	1.18
+++ syslinux	21 Jan 2005 01:43:52 -0000	1.19
@@ -26,8 +26,8 @@
 case $1 in
 	build )
 		if [ ! -f .done_dl_patch ]; then
-			bzcat $DL_DIR/src/syslinux-no_exe.patch.bz2 | patch -p1 || exit 1
-			bzcat $DL_DIR/src/syslinux-no_memdisk.patch.bz2 | patch -p1 || exit 1
+			#bzcat $DL_DIR/src/syslinux-no_exe.patch.bz2 | patch -p1 || exit 1
+			#bzcat $DL_DIR/src/syslinux-no_memdisk.patch.bz2 | patch -p1 || exit 1
 			touch .done_dl_patch
 		fi
 
@@ -42,15 +42,15 @@
 		;;
 
 	install )
-		cp isolinux.bin $CDDIR/boot || exit 1
+		cp -v isolinux.bin $CDDIR/boot || exit 1
 		#cp -dp ppmtolss16 /usr/bin || exit 1
 
 		# now copy the stuff we need for installing DL on a USB pendrive
 		mkdir -p $CDDIR/boot/syslinux || exit 1
-		cp ldlinux.bss $CDDIR/boot/syslinux || exi t1
-		cp ldlinux.sys $CDDIR/boot/syslinux || exi t1
-		cp mbr.bin $CDDIR/boot/syslinux || exi t1
-		cp syslinux $CDDIR/boot/syslinux || exi t1
+		cp -v ldlinux.bss $CDDIR/boot/syslinux || exit 1
+		cp -v ldlinux.sys $CDDIR/boot/syslinux || exit 1
+		cp -v mbr.bin $CDDIR/boot/syslinux || exit 1
+		cp -v unix/syslinux $CDDIR/boot/syslinux || exit 1
 		;;
 
 	* )

Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ntop	13 Dec 2004 16:41:11 -0000	1.7
+++ ntop	21 Jan 2005 01:43:52 -0000	1.8
@@ -74,6 +74,7 @@
 			echo "NTOP_INTERFACES=eth0,eth1" >> $CONFIGFILE
 			echo "NTOP_PORT=8080" >> $CONFIGFILE
 			echo "NTOP_SSL_PORT=0" >> $CONFIGFILE
+			echo "NTOP_DB_PATH=/etc/ntop" >> $CONFIGFILE
 			echo >> $CONFIGFILE
 			echo "HELP_$MYNAME=\"ntop is a network traffic probe that shows network usage\"" >> $SOFTWAREHELP
 		fi