devil-linux-commit Mailing List for Devil-Linux (Page 185)

Brought to you by: blubdog, friedl, small_fish, smiley73

devil-linux-commit — Mailing list for CVS commit messages.

You can subscribe to this list here.

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (202)	Nov (201)	Dec (280)
2004	Jan (493)	Feb (106)	Mar (215)	Apr (163)	May (79)	Jun (193)	Jul (47)	Aug (71)	Sep (127)	Oct (41)	Nov (49)	Dec (120)
2005	Jan (147)	Feb (45)	Mar (26)	Apr (71)	May (52)	Jun (28)	Jul (92)	Aug (50)	Sep (35)	Oct (193)	Nov (106)	Dec (52)
2006	Jan (51)	Feb (38)	Mar (33)	Apr (79)	May (107)	Jun (67)	Jul (21)	Aug (65)	Sep (44)	Oct (87)	Nov (12)	Dec (56)
2007	Jan (48)	Feb (58)	Mar (63)	Apr (31)	May (25)	Jun (20)	Jul (72)	Aug (54)	Sep (30)	Oct (76)	Nov (74)	Dec (25)
2008	Jan (39)	Feb (39)	Mar (62)	Apr (64)	May (59)	Jun (31)	Jul (25)	Aug (25)	Sep (17)	Oct (24)	Nov	Dec (1)
2009	Jan (60)	Feb (39)	Mar (16)	Apr (30)	May (52)	Jun (35)	Jul (15)	Aug (15)	Sep (21)	Oct (32)	Nov (39)	Dec (52)
2010	Jan (42)	Feb (40)	Mar (23)	Apr (20)	May (27)	Jun (10)	Jul (30)	Aug (30)	Sep (66)	Oct (12)	Nov (35)	Dec (60)
2011	Jan (16)	Feb (1)	Mar (3)	Apr (28)	May (21)	Jun	Jul (12)	Aug (6)	Sep (10)	Oct (14)	Nov (40)	Dec (60)
2012	Jan (23)	Feb (17)	Mar (24)	Apr (18)	May (13)	Jun (1)	Jul	Aug (5)	Sep	Oct (5)	Nov (5)	Dec (15)
2013	Jan (2)	Feb (5)	Mar (1)	Apr (2)	May (2)	Jun (3)	Jul	Aug (3)	Sep (5)	Oct (3)	Nov (1)	Dec (1)
2014	Jan (3)	Feb (5)	Mar (8)	Apr (3)	May (1)	Jun (1)	Jul (2)	Aug	Sep (4)	Oct (10)	Nov	Dec (9)
2015	Jan (18)	Feb (17)	Mar (5)	Apr (2)	May	Jun (5)	Jul (1)	Aug (2)	Sep (1)	Oct (24)	Nov (20)	Dec (41)
2016	Jan (9)	Feb (3)	Mar (2)	Apr (7)	May (8)	Jun (1)	Jul (6)	Aug (5)	Sep (2)	Oct (6)	Nov (1)	Dec (6)
2017	Jan (6)	Feb (1)	Mar	Apr (4)	May (1)	Jun (1)	Jul (2)	Aug (2)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 183 184 185 186 187 .. 253 > >> (Page 185 of 253)

[Devil-linux-commit] build CHANGES,1.801,1.802 md5sum.lst,1.98,1.99

From: Heiko Z. <smi...@us...> - 2004-05-26 01:13:09

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated postfix


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -d -r1.801 -r1.802
--- CHANGES	26 May 2004 01:03:17 -0000	1.801
+++ CHANGES	26 May 2004 01:12:58 -0000	1.802
@@ -22,6 +22,7 @@
 #
 
 1.2b1
+- updated postfix to v2.1.1 & pfix-tls patch to v0.8.18
 - updated sysstat to v5.0.4
 - updated quota-tools v3.12
 - updated psmisc to v21.5

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- md5sum.lst	26 May 2004 01:03:17 -0000	1.98
+++ md5sum.lst	26 May 2004 01:12:58 -0000	1.99
@@ -247,7 +247,7 @@
 c51bd34197008b128046f0799d2242e4  src/pcre-4.5.tar.bz2
 9452d398f0fcd4e5cd7ef6628bc78c6e  src/pcwd-1.42.tar.gz
 6d2b389f8c6424b7af303f417947714f  src/perl-5.8.3.tar.gz
-2d9b07d3847a06b77db3be25973acf14  src/pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz
+01785d9636bdae51a906320e581b1e6b  src/pfixtls-0.8.18-2.1.0-0.9.7d.tar.gz
 79cde484e31871176137eb78014657fa  src/php-4.3.6.tar.bz2
 a7e4f60a6657dbc434334deb594cc242  src/pkgconfig-0.15.0.tar.gz
 734b375abdcc6bf70541d0bef8147449  src/popt-1.6.4.tar.gz
@@ -255,7 +255,7 @@
 73f823d66f0e8525b77cb45d94fb90c8  src/portmap_5-2.diff.gz
 781e16ed4487c4caa082c6fef09ead4f  src/portmap_5.orig.tar.gz
 c203e22f74bdd968ee11105dd2a80ec0  src/portslave_2002.01.19.tar.gz
-3e5baf2cc497a5fb1aaa6ba11aa6491e  src/postfix-2.0.18.tar.gz
+fd747b82f949e00040c2f101e1c7a6e4  src/postfix-2.1.1.tar.gz
 82878d6d74c36384af3595d26ed38067  src/postgresql-7.3.4.tar.gz
 16169e27a6ba62ed241fef2bc5e3b3d6  src/ppp-cvs-20031002.tar.bz2
 d1852b7c8b5dfffa7d978b411ccc03da  src/ppp-patches.tar.bz2

[Devil-linux-commit] build CHANGES,1.800,1.801 md5sum.lst,1.97,1.98

From: Heiko Z. <smi...@us...> - 2004-05-26 01:03:32

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
- updated sysstat to v5.0.4
- updated quota-tools v3.12
- updated psmisc to v21.5
- syslog-ng doesn't use klogd anymore, we access /proc/kmsg directly
- added better support for chroot jail when using syslogd (Heiko + Peter
Jannesen)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -d -r1.800 -r1.801
--- CHANGES	25 May 2004 17:50:44 -0000	1.800
+++ CHANGES	26 May 2004 01:03:17 -0000	1.801
@@ -22,6 +22,11 @@
 #
 
 1.2b1
+- updated sysstat to v5.0.4
+- updated quota-tools v3.12
+- updated psmisc to v21.5
+- syslog-ng doesn't use klogd anymore, we access /proc/kmsg directly
+- added better support for chroot jail when using syslogd (Heiko + Peter Jannesen)
 - updated md5 patch for quagga to 2004-05-25 version
 - updated lftp to v3.0.4 (bs)
 - updated unzip to v5.51

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- md5sum.lst	25 May 2004 17:50:44 -0000	1.97
+++ md5sum.lst	26 May 2004 01:03:17 -0000	1.98
@@ -267,13 +267,13 @@
 27658d0a69040aca05a65b9888599d50  src/procinfo-18.tar.gz
 2672014ec05deb20680713a7b750cb16  src/procps-3.2.1.tar.gz
 b62b5856753294821c4cea8bd28ffe1d  src/protector-3.3-7.tar.gz
-8449269fdc8ae5d7d494df745e1180d3  src/psmisc-21.4.tar.gz
+c62b09ad5129e2f7e4611019d1d3d4b8  src/psmisc-21.5.tar.gz
 74c37f42e0296c5d7f86d153104a07bc  src/pwc-8.12.tar.gz
 0fa33ba1b32b254abe0b731a52c0f2f9  src/pwlib_1.5.2.tar.gz
 bc7939176fb2a53f3fbfb131cc623c64  src/python-ldap-2.0.0.tar.gz
 42e25b2a6016ff6d5ffa4f9707ac4614  src/qadsl-final-1.2.tar.gz
 cc84ef15cf4c2823a36097fe01775dc3  src/quagga-0.96.5.tar.gz
-897113033dbd9b72007818c4822b9822  src/quota-3.11.tar.gz
+d69870f4a9732ed2fe072952ee7f1462  src/quota-3.12.tar.gz
 26ea468b2323e44cf827ae5f84d18dc8  src/radvd-0.7.2.tar.gz
 c0d208ebd4c311ceabe465b7adfef792  src/raidtools-20010914.tar.gz
 5deaae3ea2300bf480b6904f8a69a7f1  src/razor-agents-2.36.tar.gz
@@ -311,7 +311,7 @@
 f587720988bc1670071f31d3694ca0fb  src/sysklogd-1.4.1.tar.bz2
 dee67ef64149d1c6cd9ee82d4ba83f71  src/syslinux-2.04.tar.bz2
 ef6121a305a4f6f6208d909ca41e6624  src/syslog-ng-1.6.4.tar.gz
-b73b02adcfc76b15612bbc6af3782b78  src/sysstat-5.0.3.tar.bz2
+07f1687e8e4366fd89861a72210e489f  src/sysstat-5.0.4.tar.bz2
 8a2d8f1ed5a2909da04132fefa44905e  src/sysvinit-2.85.tar.gz
 fdfffdd8141a00ea72c16c34b486a00a  src/tar-1.13.92.tar.bz2
 eec4e5d6cda55464970a3157eb3bc534  src/tcp_wrappers_7.6.diff.gz

[Devil-linux-commit] build/config/etc/init.d jail,1.26,1.27 syslog,1.7,1.8

From: Heiko Z. <smi...@us...> - 2004-05-26 01:03:32

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4250/config/etc/init.d

Modified Files:
	jail syslog 
Log Message:
- updated sysstat to v5.0.4
- updated quota-tools v3.12
- updated psmisc to v21.5
- syslog-ng doesn't use klogd anymore, we access /proc/kmsg directly
- added better support for chroot jail when using syslogd (Heiko + Peter
Jannesen)


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog	20 May 2004 01:06:37 -0000	1.7
+++ syslog	26 May 2004 01:03:18 -0000	1.8
@@ -27,7 +27,7 @@
     start )
 		echo -n "Starting system log daemon"
 		case $SYSLOG_DAEMON in
-		    syslog-ng )
+		  syslog-ng )
 			# make sure, that all chroot jail entries are removed
 			for I in $(ls /etc/sysconfig/jail)
 			do
@@ -37,18 +37,18 @@
 			done
 			loadproc syslog-ng
 			;;
-		    syslogd )
-			loadproc syslogd
+		  syslogd )
+			loadproc syslogd -a /var/run/log ${SYSLOGD_PARAM}
+			echo -n "Starting kernel log daemon"
+			loadproc klogd -c $KERNEL_LOGLEVEL
 			;;
-		    *)
+		  *)
 			$FAILURE
 			echo unkown SYSLOG Daemon
 			echo please check SYSLOG_DAEMON in /etc/sysconfig/config
 			$NORMAL
 			;;
 		esac
-		echo -n "Starting kernel log daemon"
-		loadproc klogd -c $KERNEL_LOGLEVEL
 		;;
 
 	stop )
@@ -59,6 +59,8 @@
 			;;
 		    syslogd )
 			killproc syslogd
+			echo -n "Stopping kernel log daemon"
+			killproc klogd
 			;;
 		    *)
 			$FAILURE
@@ -67,8 +69,6 @@
 			$NORMAL
 			;;
 		esac
-		echo -n "Stopping kernel log daemon"
-		killproc klogd
 		;;
 
 	restart)

Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- jail	20 May 2004 01:06:24 -0000	1.26
+++ jail	26 May 2004 01:03:18 -0000	1.27
@@ -252,12 +252,29 @@
 		echo -n "."
 
 		#echo "adding syslog support"
-		if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
-			sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
-			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
-		fi
+
+		case $SYSLOG_DAEMON in
+		    syslog-ng )
+			if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
+				sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
+			fi
+			;;
+
+		    syslogd )
+			ln -f /var/run/log $JAILDIR/dev/log
+			;;
+
+		    *)
+			$FAILURE
+			echo unkown SYSLOG Daemon
+			echo please check SYSLOG_DAEMON in /etc/sysconfig/config
+			$NORMAL
+			;;
+		esac
 		/etc/init.d/syslog reload
 
+
 		print_status success
 
 		if [ -n "$DAEMON" ]; then
@@ -266,9 +283,21 @@
 		fi
 		;;
 	stop )
-		sed -e "s| unix-stream(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
-		mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
+		case $SYSLOG_DAEMON in
+		    syslog-ng )
+			sed -e "s| unix-stream(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
+			;;
+
+		    *)
+			$FAILURE
+			echo unkown SYSLOG Daemon
+			echo please check SYSLOG_DAEMON in /etc/sysconfig/config
+			$NORMAL
+			;;
+		esac
 		/etc/init.d/syslog reload
+
 		# parse jail file
 		grep -v "^#" $JAIL_DEF | grep -v ^$ > /tmp/.jailtmp
 		while read COMMAND PARAM; do

[Devil-linux-commit] build/config/etc/syslog-ng syslog-ng.conf,1.9,1.10

From: Heiko Z. <smi...@us...> - 2004-05-26 01:03:31

Update of /cvsroot/devil-linux/build/config/etc/syslog-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4250/config/etc/syslog-ng

Modified Files:
	syslog-ng.conf 
Log Message:
- updated sysstat to v5.0.4
- updated quota-tools v3.12
- updated psmisc to v21.5
- syslog-ng doesn't use klogd anymore, we access /proc/kmsg directly
- added better support for chroot jail when using syslogd (Heiko + Peter
Jannesen)


Index: syslog-ng.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/syslog-ng/syslog-ng.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- syslog-ng.conf	24 May 2004 13:25:33 -0000	1.9
+++ syslog-ng.conf	26 May 2004 01:03:18 -0000	1.10
@@ -6,7 +6,7 @@
 #####################################################################
 # define the source pipe for all local messages
 #####################################################################
-source src { unix-stream("/dev/log"); internal(); };
+source src { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream("/dev/log"); internal(); };
 
 #####################################################################
 # print all messages on tty10

[Devil-linux-commit] build/config/etc/init.d syslog,1.5.2.2,1.5.2.3

From: Heiko Z. <smi...@us...> - 2004-05-25 20:14:17

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16883/config/etc/init.d

Modified Files:
      Tag: rel-1-0-patches
	syslog 
Log Message:
- updated the quagga md5 patch
- removed the recent changes to syslog-ng, let's not mess around with them in
the stable release


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- syslog	20 May 2004 00:44:10 -0000	1.5.2.2
+++ syslog	25 May 2004 20:14:02 -0000	1.5.2.3
@@ -32,7 +32,7 @@
 			for I in $(ls /etc/sysconfig/jail)
 			do
 				A=${I##/*/}
-				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s| unix-dgram(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			done
 			loadproc syslog-ng

[Devil-linux-commit] build CHANGES,1.510.2.65,1.510.2.66 md5sum.lst,1.1.2.10,1.1.2.11

From: Heiko Z. <smi...@us...> - 2004-05-25 20:14:16

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

Modified Files:
      Tag: rel-1-0-patches
	CHANGES md5sum.lst 
Log Message:
- updated the quagga md5 patch
- removed the recent changes to syslog-ng, let's not mess around with them in
the stable release


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.65
retrieving revision 1.510.2.66
diff -u -d -r1.510.2.65 -r1.510.2.66
--- CHANGES	20 May 2004 00:44:09 -0000	1.510.2.65
+++ CHANGES	25 May 2004 20:14:01 -0000	1.510.2.66
@@ -23,8 +23,7 @@
 #
 
 1.0.7
-- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
-  during a reload command (use stream instead of dgram)
+- updated md5 patch for quagga to 2004-05-25 version
 - postfix startup script now updates .db files if necessary (fl)
 - closed security hole where etc.tar.bz2 had the wrong permissions after save-config (Heiko / Tim Tait)
 - closed security hole where an ordinary user was allowed to mount the configuration floppy

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- md5sum.lst	22 Apr 2004 18:33:38 -0000	1.1.2.10
+++ md5sum.lst	25 May 2004 20:14:01 -0000	1.1.2.11
@@ -89,7 +89,7 @@
 2100cf40e86e2ebddbd40b933952b9e3  src/hostap-0.0.4.tar.gz
 200eef33ddfcee9c023a3a7797ac6919  src/hotplug-2003_08_05.tar.gz
 d7fe206771ff3146284ac8f348ba79e2  src/hotplug_nowarning.diff.bz2
-800448d5603f18bafcdc6c97c57ee409  src/ht-20040416-linux-rfc2385.patch.bz2
+65eaddfd8eb8e3f7a2b4fc4f99a080dd  src/ht-20040525-0.96.5-bgp-md5.patch.bz2
 24a53cbaf5fa312145e599d256d81403  src/htb3.6_tc.diff
 57aab055c33a6f8fdd47051d7f01941c  src/i2c-2.8.1.tar.gz
 0cd6740d0d14806a400f23e09835ca90  src/ians-2.3.63b.tar.gz

[Devil-linux-commit] build/config/etc/syslog-ng syslog-ng.conf,1.7.2.1,1.7.2.2

From: Heiko Z. <smi...@us...> - 2004-05-25 20:14:16

Update of /cvsroot/devil-linux/build/config/etc/syslog-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16883/config/etc/syslog-ng

Modified Files:
      Tag: rel-1-0-patches
	syslog-ng.conf 
Log Message:
- updated the quagga md5 patch
- removed the recent changes to syslog-ng, let's not mess around with them in
the stable release


Index: syslog-ng.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/syslog-ng/syslog-ng.conf,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- syslog-ng.conf	20 May 2004 00:44:11 -0000	1.7.2.1
+++ syslog-ng.conf	25 May 2004 20:14:02 -0000	1.7.2.2
@@ -6,7 +6,7 @@
 #####################################################################
 # define the source pipe for all local messages
 #####################################################################
-source src { unix-stream("/dev/log"); internal(); };
+source src { unix-dgram("/dev/log"); internal(); };
 
 #####################################################################
 # print all messages on tty10

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

From: Heiko Z. <smi...@us...> - 2004-05-25 20:14:16

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

Modified Files:
      Tag: rel-1-0-patches
	quagga 
Log Message:
- updated the quagga md5 patch
- removed the recent changes to syslog-ng, let's not mess around with them in
the stable release


Index: quagga
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/quagga,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- quagga	23 Apr 2004 20:45:10 -0000	1.1.2.2
+++ quagga	25 May 2004 20:14:03 -0000	1.1.2.3
@@ -19,10 +19,10 @@
 	if [ "$CONFIG_QUAGGA" = "y" ]; then
 		if [ ! -f devil-linux-quagga-patches.done ]; then
 		touch devil-linux-quagga-patches.done
-		bzcat $DL_DIR/src/ht-*-linux-rfc2385.patch.bz2  | patch -p0 || exit 1
+		bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
 	    fi
 	    ./configure --prefix=/usr --sysconfdir=/etc/zebra --localstatedir=/var/state/quagga --enable-snmp \
-		 --enable-netlink --enable-vtysh --enable-linux-rfc2385 || exit 1
+		 --enable-netlink --enable-vtysh --enable-tcp-md5 || exit 1
 	    make $PMAKE || exit 1
 	    strip_debug
 	fi

[Devil-linux-commit] build CHANGES,1.799,1.800 md5sum.lst,1.96,1.97

From: Heiko Z. <smi...@us...> - 2004-05-25 17:50:55

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated md5 patch for quagga to 2004-05-25 version


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -d -r1.799 -r1.800
--- CHANGES	25 May 2004 14:18:12 -0000	1.799
+++ CHANGES	25 May 2004 17:50:44 -0000	1.800
@@ -22,6 +22,7 @@
 #
 
 1.2b1
+- updated md5 patch for quagga to 2004-05-25 version
 - updated lftp to v3.0.4 (bs)
 - updated unzip to v5.51
 - updated save-config to adds deterministic save location, fixes issues with ISO/config on same device (Heiko / Tim Tait)

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- md5sum.lst	25 May 2004 14:18:13 -0000	1.96
+++ md5sum.lst	25 May 2004 17:50:44 -0000	1.97
@@ -124,7 +124,7 @@
 6be6bb611ee624c66d94dbca104721e9  src/hostapd-0.1.0.tar.gz
 55ee0ac0b49c3218b8d5974754ea8d56  src/hotplug-2004_01_05.tar.bz2
 e61f5a5396ed70c5971a13bd6d1ad3de  src/hotplug_nowarning.diff.bz2
-a39b5ed338eea27ec8e9408889329ec6  src/ht-20040504-0.96.5-linux-rfc2385.patch.bz2
+65eaddfd8eb8e3f7a2b4fc4f99a080dd  src/ht-20040525-0.96.5-bgp-md5.patch.bz2
 24a53cbaf5fa312145e599d256d81403  src/htb3.6_tc.diff
 275d3d37eed1b070f333d3618f7d1954  src/httpd-2.0.49.tar.gz
 fd775affb44dd65c85a5d330bebed107  src/i2c-2.8.4.tar.gz

[Devil-linux-commit] build/scripts quagga,1.3,1.4

From: Heiko Z. <smi...@us...> - 2004-05-25 17:50:54

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

Modified Files:
	quagga 
Log Message:
updated md5 patch for quagga to 2004-05-25 version


Index: quagga
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/quagga,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- quagga	13 May 2004 21:50:07 -0000	1.3
+++ quagga	25 May 2004 17:50:45 -0000	1.4
@@ -30,10 +30,10 @@
 	if [ "$CONFIG_QUAGGA" = "y" ]; then
 		if [ ! -f devil-linux-quagga-patches.done ]; then
 			touch devil-linux-quagga-patches.done
-			bzcat $DL_DIR/src/ht-*-linux-rfc2385.patch.bz2  | patch -p0 || exit 1
+			bzcat $DL_DIR/src/ht-*-bgp-md5.patch.bz2  | patch -p0 || exit 1
 		fi
 		./configure --prefix=/usr --sysconfdir=/etc/zebra --localstatedir=/var/state/quagga --enable-snmp \
-			--enable-netlink --enable-vtysh --enable-linux-rfc2385 || exit 1
+			--enable-netlink --enable-vtysh --enable-tcp-md5 || exit 1
 		make $PMAKE || exit 1
 		strip_debug
 	fi

[Devil-linux-commit] build CHANGES,1.798,1.799 md5sum.lst,1.95,1.96

From: Bruce S. <bl...@us...> - 2004-05-25 14:18:24

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
updated lftp to v3.0.4


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -d -r1.798 -r1.799
--- CHANGES	24 May 2004 13:06:38 -0000	1.798
+++ CHANGES	25 May 2004 14:18:12 -0000	1.799
@@ -22,6 +22,7 @@
 #
 
 1.2b1
+- updated lftp to v3.0.4 (bs)
 - updated unzip to v5.51
 - updated save-config to adds deterministic save location, fixes issues with ISO/config on same device (Heiko / Tim Tait)
 - updated python-ldap to v2.0.0

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- md5sum.lst	24 May 2004 13:06:38 -0000	1.95
+++ md5sum.lst	25 May 2004 14:18:13 -0000	1.96
@@ -157,7 +157,7 @@
 571f031068ea7861282f0525d67a9aa0  src/l2tpd-patches.tgz
 fabbc58e9118570c1f57ae90743e4859  src/lcd4linux-0.9.11.tar.gz
 40c2dd4ac137b61b6a55a6478817daf4  src/less-381.tar.gz
-3d66393dc91ac4aab18444cf3799563e  src/lftp-3.0.3.tar.gz
+382a08fed9f7396971996ad1ba12aefb  src/lftp-3.0.4.tar.bz2
 5aa3b0d29b27b7a3e1d80962c94f54cb  src/lha_1.14i-5.diff.gz
 10410742b0169f3357ef9a3f0f032037  src/lha_1.14i.orig.tar.gz
 0749d05f4cc14daaf20af9e40fd6a2f0  src/libdvdcss-1.2.8.tar.bz2

[Devil-linux-commit] build/config/etc/syslog-ng syslog-ng.conf,1.8,1.9

From: Heiko Z. <smi...@us...> - 2004-05-24 13:25:43

Update of /cvsroot/devil-linux/build/config/etc/syslog-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13151/config/etc/syslog-ng

Modified Files:
	syslog-ng.conf 
Log Message:
we don't want to read /dev/kmsg
this was accidently added


Index: syslog-ng.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/syslog-ng/syslog-ng.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- syslog-ng.conf	20 May 2004 01:06:38 -0000	1.8
+++ syslog-ng.conf	24 May 2004 13:25:33 -0000	1.9
@@ -6,7 +6,7 @@
 #####################################################################
 # define the source pipe for all local messages
 #####################################################################
-source src { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream("/dev/log"); internal(); };
+source src { unix-stream("/dev/log"); internal(); };
 
 #####################################################################
 # print all messages on tty10

[Devil-linux-commit] build CHANGES,1.797,1.798 md5sum.lst,1.94,1.95

From: Heiko Z. <smi...@us...> - 2004-05-24 13:06:55

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
software update & fixed comment


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -d -r1.797 -r1.798
--- CHANGES	22 May 2004 22:29:32 -0000	1.797
+++ CHANGES	24 May 2004 13:06:38 -0000	1.798
@@ -22,13 +22,13 @@
 #
 
 1.2b1
+- updated unzip to v5.51
 - updated save-config to adds deterministic save location, fixes issues with ISO/config on same device (Heiko / Tim Tait)
 - updated python-ldap to v2.0.0
 - updated cyrus-imapd to v2.2.4
 - updated CVS to v1.12.7
 - updated clamav to v0.7.1
-- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
-  during a reload command (use stream instead of dgram)
+- fixed a bug in the syslog-ng.conf file which causes /dev/log to be open as dgram and to as stream
 - updated syslog-ng to v1.6.4
 - improved install-on-usb script (Heiko + Tim Tait)
 

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- md5sum.lst	20 May 2004 01:06:24 -0000	1.94
+++ md5sum.lst	24 May 2004 13:06:38 -0000	1.95
@@ -330,7 +330,7 @@
 b8f93446d52cd1e48323fa49f10a790c  src/unarj_2.43-3.diff.gz
 7a481dc017f1fbfa7f937a97e66eb99f  src/unarj_2.43.orig.tar.gz
 1afca3128e21994042f34bcb91b4ea48  src/unrarsrc-3.2.3.tar.gz
-798592d62e37f92571184236947122ed  src/unzip550.tar.gz
+8a25712aac642430d87d21491f7c6bd1  src/unzip551.tar.gz
 2b4d12f9dd2469f8d9c5698c6fb0b289  src/usb.ids.bz2
 2e8d4e13ea386592109ad3f5eb7e481f  src/usbat-02.20031116.tar.gz
 f6ceb3328c80e8e83349c458a0331991  src/usbat02-kernel-Makefile.diff.bz2

[Devil-linux-commit] build/scripts/scripts save-config,1.28,1.29

From: Heiko Z. <smi...@us...> - 2004-05-22 22:29:41

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

Modified Files:
	save-config 
Log Message:
Adds deterministic save location, fixes issues with ISO/config on same
device (Tim Tait)


Index: save-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/save-config,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- save-config	27 Apr 2004 13:39:35 -0000	1.28
+++ save-config	22 May 2004 22:29:33 -0000	1.29
@@ -13,46 +13,117 @@
 source /etc/init.d/functions
 
 QUIET=""
+DL_CONFIG_SOURCE=""
+DL_CONFIG_FILE="etc.tar.bz2"
 
-if [ "$1" = "-q" ]; then
-  QUIET="yes"
+CONFIG_MOUNT=/var/adm/mount
+mkdir -p $CONFIG_MOUNT || exit 1
+
+if [ -f "/shm/DL_CONFIG_SOURCE" ]; then
+    DL_CONFIG_SOURCE=`cat /shm/DL_CONFIG_SOURCE 2> /dev/null`
 fi
 
-# generate the device list we need to search for the configuration information
-PARTITIONS_IDE=`find /dev/ide/ -name "part*" 2> /dev/null`
-PARTITIONS_SCSI=`find /dev/scsi/ -name "part*" 2> /dev/null`
-FLOPPIES=`find /dev/floppy/ -name "?" 2> /dev/null`
-CONFIG_SRC_LIST="$PARTITIONS_SCSI $PARTITIONS_IDE $FLOPPIES"
+if [ -f "/shm/DL_CONFIG_FILE" ]; then
+    DL_CONFIG_FILE=`cat /shm/DL_CONFIG_FILE 2> /dev/null`
+fi
 
-CONFIG_MOUNT=/var/adm/mount
-DL_CONFIG_SOURCE=""
+while [ ! -z "$1" ]; do
+    case "$1" in
+	"-h" ) 
+	    	echo "save-config [-hqs] [-d DEVICE] [-f FILE]"
+		echo "  Saves the Devil-Linux configuration (/etc and /root trees) to a bzip2 compressed tar file."
+		echo "  By default, the file loaded during boot will updated."
+		echo;
+		echo "  -d <devicename>  Device to use for configuration file."
+		echo "  -f <filename>    Name of configuration file (default is \"etc.tar.bz2\")."
+		echo "  -h               This help text"
+		echo "  -q               Quiet operation, no status ouput."
+		echo "  -s               Force search of all devices for configuration file."
+		echo;
+		exit 0
+	;;
 
-mkdir -p $CONFIG_MOUNT || exit 1
+	"-q" )   QUIET="yes"
+	;;
 
-$GREEN
-echo -e "searching for configuration media"
-$NORMAL
+	"-d" )
+		shift
+		if [ -z "$1" ]; then
+		    echo "Error - Device name missing"
+		    exit 1
+		else
+		    DL_CONFIG_SOURCE=$1
+		fi
+	;;
 
-until [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ;
-do
+	"-s" )
+	   	DL_CONFIG_SOURCE=""
+	;;
+
+	"-f" )
+		shift
+		if [ -z "$1" ]; then
+		    echo "Error - File name missing"
+		    exit 1
+		else
+		    DL_CONFIG_FILE=$1
+		fi
+	;;
+
+	* )
+		echo "Unknown option:  $1"
+		exit 1
+	;;
+    esac
+    shift
+done
+
+if [ -n $DL_CONFIG_SOURCE ]; then
+	if [ -b $DL_CONFIG_SOURCE ]; then
+		if [ -z "$QUIET" ]; then
+		    $GREEN
+ 		    echo -e "Found configuration file location used by boot: $DL_CONFIG_SOURCE"
+		    $NORMAL
+		fi
+	else
+	    $FAILURE
+	    echo "Configuration file device specified \"$DL_CONFIG_SOURCE\" no longer exists!"
+	    echo "Run save-config again with \"-s\" switch to search for other locations."
+	    $NORMAL
+    	    exit 0
+	fi
+else
+
+    # generate the device list we need to search for the configuration information
+    PARTITIONS_IDE=`find /dev/ide/ -name "part*" 2> /dev/null`
+    PARTITIONS_SCSI=`find /dev/scsi/ -name "part*" 2> /dev/null`
+    FLOPPIES=`find /dev/floppy/ -name "?" 2> /dev/null`
+    CONFIG_SRC_LIST="$PARTITIONS_SCSI $PARTITIONS_IDE $FLOPPIES"
+
+    $GREEN
+    echo -e "searching for configuration media"
+    $NORMAL
+
+    until [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ;
+    do
 	for CFG_SRC in $CONFIG_SRC_LIST
 	do
 		echo -e "Checking $CFG_SRC"
-		if mount -n -t auto $CFG_SRC $CONFIG_MOUNT >/dev/null 2>&1  ; then
+		if mount -n -o ro,noatime -t auto $CFG_SRC $CONFIG_MOUNT >/dev/null 2>&1  ; then
 
-			if [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; then
+			if [ -e "$CONFIG_MOUNT/$DL_CONFIG_FILE" ] ; then
+				umount $CONFIG_MOUNT
 				$SUCCESS
 				echo -e "Found configuration on $CFG_SRC"
 				$NORMAL
-				DL_CONFIG_SOURCE=$CFG_SRC
 				if [ -z "$QUIET" ]; then
 					echo -n "Do you want to use this device?"
 					if ask_yes_no ; then
+						DL_CONFIG_SOURCE=$CFG_SRC
 						continue 2
-					else
-						umount $CONFIG_MOUNT
 					fi
 				else
+					DL_CONFIG_SOURCE=$CFG_SRC
 					continue 2
 				fi
 			else
@@ -61,10 +132,8 @@
 				$SUCCESS
 				echo -e "\n*** Found empty media $CFG_SRC . ***\n"
 				$NORMAL
-				echo -n "Should I copy default configuration to it?"
+				echo -n "Do you want to save your configuration to this device?"
 				if ask_yes_no ; then
-					mount -t auto $CFG_SRC $CONFIG_MOUNT >/dev/null 2>&1
-					cp -i /config/etc.tar.bz2 $CONFIG_MOUNT/
 					DL_CONFIG_SOURCE=$CFG_SRC
 					continue 2
 				fi
@@ -77,22 +146,34 @@
 	$NORMAL
 	read ANS
 	echo
-done
-
-umount $CONFIG_MOUNT &> /dev/null
+    
+    done
+fi
 
 $WARNING
 echo "using device $DL_CONFIG_SOURCE"
 $NORMAL
 
-until [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; do
-	if mount $DL_CONFIG_SOURCE $CONFIG_MOUNT 2>&1 >/dev/null  ; then
-		if [ -e $CONFIG_MOUNT/etc.tar.bz2 ] ; then
-			continue
+until [ -e $CONFIG_MOUNT/$DL_CONFIG_FILE ] ; do
+#	if mount $DL_CONFIG_SOURCE $CONFIG_MOUNT 2>&1 >/dev/null  ; then
+	if mount -o ro,noatime $DL_CONFIG_SOURCE $CONFIG_MOUNT ; then
+		if [ -e $CONFIG_MOUNT/$DL_CONFIG_FILE ] ; then
+			$YELLOW
+			echo "Updating file on device..."
+			$NORMAL
+			break
 		else
-			umount $CONFIG_MOUNT
+			# why should we require it exist? If the user
+			# wants it elsewhere let them say so.
+			# maybe the wanted to make a copy of a tesy config
+			# on a new diskette?
+			$YELLOW
+			echo "Creating new file on device..."
+			$NORMAL
+			break
 		fi
 	fi
+	umount $CONFIG_MOUNT &> /dev/null
 	beep;beep;
 	$FAILURE
 	echo "Please insert Configuration Media in $DL_CONFIG_SOURCE"
@@ -100,11 +181,11 @@
 	sleep 2
 done
 
-if [ -z "$QUIET" ]; then
+if [ -z "$QUIET" -a -e $CONFIG_MOUNT/$DL_CONFIG_FILE ] ; then
 	$SUCCESS
 	echo "listing difference"
 	$NORMAL
-	( cd / ; tar -djf $CONFIG_MOUNT/etc.tar.bz2 etc )
+	( cd / ; tar -djf $CONFIG_MOUNT/$DL_CONFIG_FILE etc )
 
 	umount $CONFIG_MOUNT
 
@@ -116,15 +197,18 @@
 	fi
 fi
 
+# This umount seems completely un-needed? Is this to give the user a chance to switch media?
 umount $CONFIG_MOUNT &> /dev/null
 
-mount -t auto $DL_CONFIG_SOURCE $CONFIG_MOUNT
+# mount RO at first to avoid mount error if config is on same device as ISO
+mount -o ro,noatime -t auto $DL_CONFIG_SOURCE $CONFIG_MOUNT
+mount -o remount,rw,noatime $CONFIG_MOUNT
 
 $SUCCESS
 echo "Saving current configuration"
 $NORMAL
 
-tar -C /shm -cjf $CONFIG_MOUNT/etc.tar.bz2 \
+tar -C /shm -cjf $CONFIG_MOUNT/$DL_CONFIG_FILE \
   --exclude=*~ \
   --exclude=mtab \
   --exclude=*.2.old \
@@ -143,15 +227,18 @@
 if [ $error -eq 141 ]; then
 	echo "media protected, configuration not saved"
 else
-	chmod 0600 $CONFIG_MOUNT/etc.tar.bz2
+	chmod 0600 $CONFIG_MOUNT/$DL_CONFIG_FILE
 	$SUCCESS
 	echo "Configuration saved"
 	$NORMAL
 
 	# run user specfic script after successful save
 	# useful for backing up the config elsewhere
-	[ -x /root/bin/post-save-config ] && /root/bin/post-save-config
+	# Pass device and file name just saved
+	[ -x /root/bin/post-save-config ] && /root/bin/post-save-config $DL_CONFIG_SOURCE $CONFIG_MOUNT $DL_CONFIG_FILE
 fi
 
-umount $CONFIG_MOUNT
 sync;sync;sync
+# This kludge is in case configuration device is also location of bootcd.iso. Restore back to RO mode
+mount -o remount,ro,noatime $CONFIG_MOUNT
+umount $CONFIG_MOUNT

[Devil-linux-commit] build CHANGES,1.796,1.797

From: Heiko Z. <smi...@us...> - 2004-05-22 22:29:41

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

Modified Files:
	CHANGES 
Log Message:
Adds deterministic save location, fixes issues with ISO/config on same
device (Tim Tait)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -d -r1.796 -r1.797
--- CHANGES	20 May 2004 01:06:23 -0000	1.796
+++ CHANGES	22 May 2004 22:29:32 -0000	1.797
@@ -22,6 +22,7 @@
 #
 
 1.2b1
+- updated save-config to adds deterministic save location, fixes issues with ISO/config on same device (Heiko / Tim Tait)
 - updated python-ldap to v2.0.0
 - updated cyrus-imapd to v2.2.4
 - updated CVS to v1.12.7

[Devil-linux-commit] build/scripts/configuration/profiles default,1.28,1.29

From: Heiko Z. <smi...@us...> - 2004-05-20 01:15:06

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

Modified Files:
	default 
Log Message:
added missing mt


Index: default
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- default	5 May 2004 18:29:22 -0000	1.28
+++ default	20 May 2004 01:14:54 -0000	1.29
@@ -131,6 +131,7 @@
 CONFIG_PYTHON=y
 CONFIG_PYTHON_LDAP=y
 CONFIG_QADSL=y
+CONFIG_QUAGGA=y
 CONFIG_QUOTA_TOOLS=y
 CONFIG_RADVD=y
 CONFIG_RAIDTOOLS=y
@@ -185,4 +186,4 @@
 CONFIG_XINETD=y
 CONFIG_ZIP=y
 CONFIG_ZISOFS=y
-CONFIG_QUAGGA=y
+CONFIG_MT_ST=y

[Devil-linux-commit] build CHANGES,1.795,1.796 md5sum.lst,1.93,1.94

From: Heiko Z. <smi...@us...> - 2004-05-20 01:07:04

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

Modified Files:
	CHANGES md5sum.lst 
Log Message:
- a bunch of software updates
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -d -r1.795 -r1.796
--- CHANGES	18 May 2004 01:06:41 -0000	1.795
+++ CHANGES	20 May 2004 01:06:23 -0000	1.796
@@ -22,6 +22,13 @@
 #
 
 1.2b1
+- updated python-ldap to v2.0.0
+- updated cyrus-imapd to v2.2.4
+- updated CVS to v1.12.7
+- updated clamav to v0.7.1
+- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
+  during a reload command (use stream instead of dgram)
+- updated syslog-ng to v1.6.4
 - improved install-on-usb script (Heiko + Tim Tait)
 
 1.1.4

Index: md5sum.lst
===================================================================
RCS file: /cvsroot/devil-linux/build/md5sum.lst,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- md5sum.lst	17 May 2004 23:13:36 -0000	1.93
+++ md5sum.lst	20 May 2004 01:06:24 -0000	1.94
@@ -34,7 +34,7 @@
 c0cdfa2dbe9f4c977b0a71fb08ddff0e  src/cdrtools-2.00.3.tar.gz
 376ee0327bb6060a03052cdc71bb371f  src/chpax-0.6.tar.gz
 9d88f2d090fcafcd0e2fa73b018b6e16  src/cipe-1.5.4.tar.gz
-2599a2e6b06d1f8ca09fdef8bc17625c  src/clamav-0.70.tar.gz
+096cffd2633cbac5a14b7080b6f67a67  src/clamav-0.71.tar.gz
 0c030b9eb8f0d36daae5a32b8920dfd0  src/compartment-1.2-suse-patches.diff.bz2
 2df15081f6475e6331cdd813f9d0918c  src/compartment-1.2.tar.bz2
 80a2ce34e6ac028ffd3f3700c451d1c6  src/compartment-env.diff.bz2
@@ -46,8 +46,8 @@
 5c356f45bde4233a9b2a5ae78ae4e9e1  src/cramfs-1.1.tar.gz
 97456d1da7da7140324116fb55b7957e  src/cron-3.0.1-suse.tar.bz2
 e0eb377840b01e11e5cd008ae9b7d2af  src/cutter-1.02.tgz
-eeacc440ad77e0671bffa0fd2900f419  src/cvs-1.12.5.tar.bz2
-32888c5120edeb2867d6283fedbdb7d5  src/cyrus-imapd-2.2.3.tar.gz
+d6ba187017c897922fa6f38a69c7d276  src/cvs-1.12.7.tar.gz
+50831a41ba0121754431e8507887d511  src/cyrus-imapd-2.2.4.tar.gz
 1eafae95f0289c10f187d8b2bc4032cf  src/cyrus-sasl-2.1.18.tar.gz
 c3effff791f4f1386d00a6a68722a688  src/daemontools-0.76.errno.patch.bz2
 0b4c4417aa149c4523a071647ad6778f  src/daemontools-0.76.tar.gz
@@ -270,7 +270,7 @@
 8449269fdc8ae5d7d494df745e1180d3  src/psmisc-21.4.tar.gz
 74c37f42e0296c5d7f86d153104a07bc  src/pwc-8.12.tar.gz
 0fa33ba1b32b254abe0b731a52c0f2f9  src/pwlib_1.5.2.tar.gz
-35314970493ff8a5729350eace052468  src/python-ldap-2.0.0pre20.tar.gz
+bc7939176fb2a53f3fbfb131cc623c64  src/python-ldap-2.0.0.tar.gz
 42e25b2a6016ff6d5ffa4f9707ac4614  src/qadsl-final-1.2.tar.gz
 cc84ef15cf4c2823a36097fe01775dc3  src/quagga-0.96.5.tar.gz
 897113033dbd9b72007818c4822b9822  src/quota-3.11.tar.gz
@@ -310,7 +310,7 @@
 9248a32e8317cfd0d70bf3f85b7bf7fa  src/super-freeswan-1.99.8.tar.gz
 f587720988bc1670071f31d3694ca0fb  src/sysklogd-1.4.1.tar.bz2
 dee67ef64149d1c6cd9ee82d4ba83f71  src/syslinux-2.04.tar.bz2
-c84bf2b80bc44a5716c9c20402c85eaf  src/syslog-ng-1.6.2.tar.gz
+ef6121a305a4f6f6208d909ca41e6624  src/syslog-ng-1.6.4.tar.gz
 b73b02adcfc76b15612bbc6af3782b78  src/sysstat-5.0.3.tar.bz2
 8a2d8f1ed5a2909da04132fefa44905e  src/sysvinit-2.85.tar.gz
 fdfffdd8141a00ea72c16c34b486a00a  src/tar-1.13.92.tar.bz2

[Devil-linux-commit] build/config/etc/init.d jail,1.25,1.26 syslog,1.6,1.7

From: Heiko Z. <smi...@us...> - 2004-05-20 01:06:49

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15716/config/etc/init.d

Modified Files:
	jail syslog 
Log Message:
- a bunch of software updates
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- syslog	13 Mar 2004 15:08:28 -0000	1.6
+++ syslog	20 May 2004 01:06:37 -0000	1.7
@@ -32,7 +32,7 @@
 			for I in $(ls /etc/sysconfig/jail)
 			do
 				A=${I##/*/}
-				sed -e "s| unix-dgram(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			done
 			loadproc syslog-ng

Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- jail	26 Dec 2003 14:34:39 -0000	1.25
+++ jail	20 May 2004 01:06:24 -0000	1.26
@@ -252,8 +252,8 @@
 		echo -n "."
 
 		#echo "adding syslog support"
-		if [ -z "$(grep "unix-dgram(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
-			sed -e "s|^source src {|source src { unix-dgram(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
+			sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		fi
 		/etc/init.d/syslog reload
@@ -266,7 +266,7 @@
 		fi
 		;;
 	stop )
-		sed -e "s| unix-dgram(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		sed -e "s| unix-stream(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 		mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		/etc/init.d/syslog reload
 		# parse jail file

[Devil-linux-commit] build/config/etc/syslog-ng syslog-ng.conf,1.7,1.8

From: Heiko Z. <smi...@us...> - 2004-05-20 01:06:48

Update of /cvsroot/devil-linux/build/config/etc/syslog-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15716/config/etc/syslog-ng

Modified Files:
	syslog-ng.conf 
Log Message:
- a bunch of software updates
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: syslog-ng.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/syslog-ng/syslog-ng.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- syslog-ng.conf	17 Dec 2002 19:50:13 -0000	1.7
+++ syslog-ng.conf	20 May 2004 01:06:38 -0000	1.8
@@ -6,7 +6,7 @@
 #####################################################################
 # define the source pipe for all local messages
 #####################################################################
-source src { unix-dgram("/dev/log"); internal(); };
+source src { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream("/dev/log"); internal(); };
 
 #####################################################################
 # print all messages on tty10

[Devil-linux-commit] build/config/etc/init.d jail,1.21.2.2,1.21.2.3 syslog,1.5.2.1,1.5.2.2

From: Heiko Z. <smi...@us...> - 2004-05-20 00:44:29

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11621/config/etc/init.d

Modified Files:
      Tag: rel-1-0-patches
	jail syslog 
Log Message:
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: syslog
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/syslog,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- syslog	13 Mar 2004 15:07:53 -0000	1.5.2.1
+++ syslog	20 May 2004 00:44:10 -0000	1.5.2.2
@@ -32,7 +32,7 @@
 			for I in $(ls /etc/sysconfig/jail)
 			do
 				A=${I##/*/}
-				sed -e "s| unix-dgram(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+				sed -e "s| unix-stream(\"$JAIL_DIR/$A/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 				mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 			done
 			loadproc syslog-ng

Index: jail
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/jail,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- jail	26 Dec 2003 14:45:57 -0000	1.21.2.2
+++ jail	20 May 2004 00:44:10 -0000	1.21.2.3
@@ -252,8 +252,8 @@
 		echo -n "."
 
 		#echo "adding syslog support"
-		if [ -z "$(grep "unix-dgram(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
-			sed -e "s|^source src {|source src { unix-dgram(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		if [ -z "$(grep "unix-stream(\"$JAILDIR/dev/log\");" /etc/syslog-ng/syslog-ng.conf)" ]; then
+			sed -e "s|^source src {|source src { unix-stream(\"$JAILDIR/dev/log\");|" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 			mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		fi
 		/etc/init.d/syslog reload
@@ -266,7 +266,7 @@
 		fi
 		;;
 	stop )
-		sed -e "s| unix-dgram(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
+		sed -e "s| unix-stream(\"$JAILDIR/dev/log\");||" < /etc/syslog-ng/syslog-ng.conf > /tmp/tmpfile
 		mv /tmp/tmpfile /etc/syslog-ng/syslog-ng.conf
 		/etc/init.d/syslog reload
 		# parse jail file

[Devil-linux-commit] build/config/etc/syslog-ng syslog-ng.conf,1.7,1.7.2.1

From: Heiko Z. <smi...@us...> - 2004-05-20 00:44:29

Update of /cvsroot/devil-linux/build/config/etc/syslog-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11621/config/etc/syslog-ng

Modified Files:
      Tag: rel-1-0-patches
	syslog-ng.conf 
Log Message:
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: syslog-ng.conf
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/syslog-ng/syslog-ng.conf,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- syslog-ng.conf	17 Dec 2002 19:50:13 -0000	1.7
+++ syslog-ng.conf	20 May 2004 00:44:11 -0000	1.7.2.1
@@ -6,7 +6,7 @@
 #####################################################################
 # define the source pipe for all local messages
 #####################################################################
-source src { unix-dgram("/dev/log"); internal(); };
+source src { unix-stream("/dev/log"); internal(); };
 
 #####################################################################
 # print all messages on tty10

[Devil-linux-commit] build CHANGES,1.510.2.64,1.510.2.65

From: Heiko Z. <smi...@us...> - 2004-05-20 00:44:28

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

Modified Files:
      Tag: rel-1-0-patches
	CHANGES 
Log Message:
- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
  during a reload command (use stream instead of dgram)


Index: CHANGES
===================================================================
RCS file: /cvsroot/devil-linux/build/CHANGES,v
retrieving revision 1.510.2.64
retrieving revision 1.510.2.65
diff -u -d -r1.510.2.64 -r1.510.2.65
--- CHANGES	13 May 2004 23:41:16 -0000	1.510.2.64
+++ CHANGES	20 May 2004 00:44:09 -0000	1.510.2.65
@@ -23,6 +23,8 @@
 #
 
 1.0.7
+- fixed a bug in the syslog-ng.conf file which causes /dev/log to be closed
+  during a reload command (use stream instead of dgram)
 - postfix startup script now updates .db files if necessary (fl)
 - closed security hole where etc.tar.bz2 had the wrong permissions after save-config (Heiko / Tim Tait)
 - closed security hole where an ordinary user was allowed to mount the configuration floppy

[Devil-linux-commit] build/docs/documentation documentation.xml,1.58,1.59

From: Bruce S. <bl...@us...> - 2004-05-19 00:42:02

Update of /cvsroot/devil-linux/build/docs/documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23433

Modified Files:
	documentation.xml 
Log Message:
Fixed typo.


Index: documentation.xml
===================================================================
RCS file: /cvsroot/devil-linux/build/docs/documentation/documentation.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- documentation.xml	15 Apr 2004 23:58:34 -0000	1.58
+++ documentation.xml	19 May 2004 00:41:45 -0000	1.59
@@ -668,7 +668,7 @@
         <para>When you unpack the Devil-Linux tarball, you find the file <command>custom-cd</command> which helps you adding or replacing file on the CD. Create and test your configuration using a floppy disk, otherwise you will need a lot of CDs. Once you configuration is finished, add you <filename>etc.tar.bz2</filename> to the root directory of the CD.</para>
       </sect2>
       <sect2>
-        <title>Booting Devil-Linux from devices other then the CD-ROM</title>
+        <title>Booting Devil-Linux from devices other than the CD-ROM</title>
         <para><filename></filename>You can boot Devil-Linux from i.e. USB PenDrives, when you computer supports this.</para>
         <para>When you unpack the Devil-Linux tarball, you find the file <command>install-on-usb</command> which does everything for you. </para>
         <para>If you intend to boot from other devices, this script should be you starting point. You probably don't even need to modify it. But please be aware, that we currently only support CD-ROM and USB boot.</para>

[Devil-linux-commit] build/scripts ipac-ng,1.10,1.11

From: Heiko Z. <smi...@us...> - 2004-05-18 22:03:57

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

Modified Files:
	ipac-ng 
Log Message:
new ipac-ng has a bit a different folder-structure/content


Index: ipac-ng
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipac-ng,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ipac-ng	11 Jan 2004 14:43:04 -0000	1.10
+++ ipac-ng	18 May 2004 22:03:35 -0000	1.11
@@ -45,11 +45,10 @@
 			cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
 			rm -rf $WORKDIR/tmp || exit 1
 
-			mkdir -p $DOCDIR/ipac-ng/{contrib,html} || exit 1
+			mkdir -p $DOCDIR/ipac-ng/{contrib,doc} || exit 1
 			cp -dpR ./contrib $DOCDIR/ipac-ng/ || exit 1
-			cp -dpR ./html $DOCDIR/ipac-ng/ || exit 1
+			cp -dpR ./doc $DOCDIR/ipac-ng/ || exit 1
 			cp -dpR ./READM* $DOCDIR/ipac-ng/ || exit 1
-			cp -dpR ./{TODO,UPDATE,CHANGES} $DOCDIR/ipac-ng/ || exit 1
 		fi
 		;;

[Devil-linux-commit] build/scripts/scripts install-on-usb,1.12,1.13

From: Heiko Z. <smi...@us...> - 2004-05-18 01:06:53

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

Modified Files:
	install-on-usb 
Log Message:
major feature enhancements and code cleanups for install-on-usb script
increased version number


Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- install-on-usb	16 Nov 2003 16:29:38 -0000	1.12
+++ install-on-usb	18 May 2004 01:06:43 -0000	1.13
@@ -10,18 +10,41 @@
 #
 #
 
-BOOTLOADER="syslinux"
-#BOOTLOADER="grub"
-#BOOTLOADER="lilo"
+TMPDIR="./tmp-install2usb"
 
+#### Pick your favorite disk part tool:
 FDISK="fdisk"
 #FDISK="cfdisk"
 
+copy_iso_file ()
+{
+	# $1 = source device or file
+	# $2 = target file path
+
+	isosize_bin="$TMPDIR/iso-mnt/usr/bin/isosize"
+	if [ -b "$1" ]; then
+		#which isosize || { echo "Utility isosize not found - can not copy from a CD."; return 1; }
+		echo "copying image of CD in $1 to device mounted on $2"
+		iso_info=`$isosize_bin -x $1`
+		nsectors=`echo $iso_info | cut -d' ' -f3 | cut -d',' -f1`
+		bs=`echo $iso_info  | cut -d' ' -f6`
+		nice dd bs=$bs count=$nsectors if=$1 of=$2 || return 1
+		return 0
+	elif [ -f "$1" ]; then
+		echo "copying source file $1 to device mounted on $2"
+		nice cp -p $1 $2 || return 1
+		return 0
+	else
+		echo "$1 is not a valid source for the ISO"
+		return 1
+	fi
+}
+
 ask_yes_no ()
 {
 	ANS=""
-	read -p " (y/n) " -t 60 -n 1 -rs ANS
-	echo
+	read -p " (y/n) " -n 1 -rs ANS
+	echo $ANS
 	[ ${ANS:-n} = "y" -o ${ANS:-n} = "Y" ] && return 0
 	return 1
 }
@@ -41,7 +64,8 @@
 
 install_lilo ()
 {
-	cat  > ./tmp/mnt2/boot/lilo.conf  <<-EOF
+	echo "Configuring LILO boot sector and menu"
+	cat  > $TMPDIR/disk-mnt/boot/lilo.conf  <<-EOF
 		read-only
 		compact
 		lba32
@@ -56,68 +80,77 @@
 
 		image  = /boot/vmlinuz
 			label  = Devil-Linux
-			append = "init=/linuxrc ramdisk_blocksize=4096"
+			append = "init=/linuxrc $RAMDISK"
 			root = /dev/ram0
 			initrd = /boot/initrd.gz
 
 	EOF
-	cp /boot/boot.b tmp/mnt2/boot/ || return 1
-	cp /boot/mbr.b tmp/mnt2/boot/ || return 1
-	lilo -r ./tmp/mnt2 -C /boot/lilo.conf -M $1 || return 1
-	lilo -r ./tmp/mnt2 -C /boot/lilo.conf -b $1 || return 1
+	cp /boot/boot.b tmp/disk-mnt/boot/ || return 1
+	cp /boot/mbr.b tmp/disk-mnt/boot/ || return 1
+	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -M $1 || return 1
+	lilo -r $TMPDIR/disk-mnt -C /boot/lilo.conf -b $1 || return 1
 }
 
 install_grub ()
 {
-	grub_shell=./tmp/mnt2/sbin/grub
+	echo "Configuring Grub boot sector and menu..."
+	grub_shell=$TMPDIR/iso-mnt/sbin/grub
 	device_map=grub-tmp-map
 	force_lba=""
+			
+	if [ ! -f "$grub_shell" ]; then
+           echo "Grub not found in ISO image - was it included in the DL build?"
+	   umount $TMPDIR/iso-mnt #|| exit 1
+	   umount $TMPDIR/disk-mnt #|| exit 1
+	   exit 1
+	fi
+	
 	rm -f $device_map
 
-	cat  > ./tmp/mnt2/boot/grub/grub.conf  <<-EOF
+	cat  > $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
 	timeout=10
 	splashimage=(hd0,$2)/boot/grub/devil-linux.xpm.gz
 	title Devil-Linux - Standard VGA
 	      root (hd0,$2)
-	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096
+	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK
 	      initrd /boot/initrd.gz
 	title Devil-Linux - VESA Frame Buffer 640x480
 	      root (hd0,$2)
-	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=769
+	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=769
 	      initrd /boot/initrd.gz
 	title Devil-Linux - VESA Frame Buffer 800x600
 	      root (hd0,$2)
-	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=771
+	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=771
 	      initrd /boot/initrd.gz
 	title Devil-Linux - VESA Frame Buffer 1024x768
 	      root (hd0,$2)
-	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=773
+	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=773
 	      initrd /boot/initrd.gz
 	title Devil-Linux - Other
 	      root (hd0,$2)
-	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc ramdisk_blocksize=4096 vga=ask
+	      kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK vga=ask
 	      initrd /boot/initrd.gz
 	EOF
-	if [ -f ./tmp/mnt2/boot/memtest ]; then
-		cat >> ./tmp/mnt2/boot/grub/grub.conf  <<-EOF
+	if [ -f "$TMPDIR/disk-mnt/boot/memtest" ]; then
+		cat >> $TMPDIR/disk-mnt/boot/grub/grub.conf  <<-EOF
 		title Memtest86
 			root (hd0,$2)
 			kernel /boot/memtest
 		EOF
 	fi
-	pushd ./tmp/mnt2/boot/grub > /dev/null
+	pushd $TMPDIR/disk-mnt/boot/grub > /dev/null
 	rm -f menu.lst
 	ln -s grub.conf menu.lst
 	popd > /dev/null
 
-	$grub_shell --batch --device-map=$device_map <<-EOF
+	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
 		quit
 		EOF
 
 	install_drive=$(grep "$1\$" $device_map|cut -f1)
 	root_drive="${install_drive%%)},0)"
 
-	$grub_shell --batch --device-map=$device_map <<-EOF
+	$grub_shell --batch --device-map=$device_map <<-EOF > /dev/null
 		root $root_drive
 		setup $force_lba $install_drive
 		quit
@@ -125,97 +158,235 @@
 	rm -f $device_map
 }
 
-function install
+install_dl ()
 {
-	test -d ./tmp && rm -rf ./tmp
 
-	mkdir -p ./tmp/mnt{1,2} || return 1
+	if [ -d "$TMPDIR" ]; then
+		# unclean exit before
+		umount $TMPDIR/iso-mnt &> /dev/null 
+		umount $TMPDIR/disk-mnt &> /dev/null		
+		rm -rf $TMPDIR &> /dev/null
+	fi
+
+	mkdir -p $TMPDIR/iso-mnt || return 1
+	mkdir -p $TMPDIR/disk-mnt || return 1
 
 #	echo "Available USB storage devices: "
 #	for device in $(allAttachedScsiUsb)
 #	do
 #		echo -n "$(scsiDevFromScsiUsb $device) "
 #	done
+
 	echo
-	read -p "Enter PARTITION name on USB device (i.e. /dev/sda1) -> " PARTITION
-	read -p "Enter DEVICE name of USB device (i.e. /dev/sda) -> " DEVICE
+	read -p "Enter DL ISO source (disk file (default: bootcd.iso) or CD device) -> " DLISO
 
+	if [ -z "$DLISO" ]; then
+		DLISO="bootcd.iso"
+	fi
 
-	for device in "$PARTITION" "$DEVICE"
-	do
-		if [ -L $device ]; then
-			echo "If you are using devfs, you must supply the full device, not the link."
-			exit
-		fi
-		if [ ! -b $device ]; then
-			echo "Cannot find:  $device"
-			exit
-		fi
-	done
+	if [ -L "$DLISO" ]; then
+		DLISO=$(readlink -fns $DLISO)
+		echo " Expanding link to: $DLISO"
+	fi
+	if [ ! -e "$DLISO" ]; then
+		echo " Cannot find file or device:  $DLISO"
+		return 1
+	fi
 
-	GRUBPART=$(expr $(basename ${PARTITION} | sed -e 's/^part//' -e 's/^[hs]d[a-z]//') - 1)
+	if [ -b "$DLISO" ]; then
+		mount -t iso9660 -o ro $DLISO $TMPDIR/iso-mnt || return 1
+	else
+		mount -o loop,ro -t iso9660 $DLISO $TMPDIR/iso-mnt || return 1
+	fi
+	if [ -f "$TMPDIR/iso-mnt/DEVIL-LINUX" ]; then
+		dl_version=`cat $TMPDIR/iso-mnt/DEVIL-LINUX`
+		echo " Devil Linux $dl_version found in ISO"
+	else
+		echo
+		echo "$DLISO does not seem to contain Devil-Linux!"
+		return 1
+	fi
 
 	echo
-	#echo "Please make sure the partition type is 'Linux' (83) "
-	echo "Please make sure the partition type is 'FAT16' (06) "
-	echo
+	read -p "Enter DEVICE name of disk device (i.e. /dev/sda) -> " DEVICE
 
 	$FDISK -l $DEVICE
 
-	echo;echo -n "Do you want to partition the media ? "
+	echo
+	echo "If you wish to store the ISO and configuration on the same media, two partitions are recommended."
+	echo -n "Do you want to partition the media first? "
 	ask_yes_no && $FDISK $DEVICE
+	
+	echo
+	read -p "Enter PARTITION name of disk device to put ISO file (i.e. /dev/sda1) -> " PARTITION
 
-	echo;echo "     Partition:  $PARTITION"
-	echo "     Device:  $DEVICE"
+	if [ -L "$PARTITION" ]; then
+		PARTITION=$(readlink -fns $PARTITION)
+		echo " Expanding link to full partition name for devfs : $PARTITION"
+	fi
+	if [ ! -b "$PARTITION" ]; then
+		echo " Cannot find device:  $PARTITION"
+		return 1
+	fi
 
-	echo;echo -n "All data on device will be lost, continue ? "
-	ask_yes_no || return 0
+	if [ -L "$DEVICE" ]; then
+		DEVICE=$(readlink -fns $DEVICE)
+		echo " Expanding link to full device name for devfs : $DEVICE"
+	fi
+	if [ ! -b "$DEVICE" ]; then
+		echo " Cannot find device:  $DEVICE"
+		return 1
+	fi
+
+	echo
+	ETC_FILE=""
+	read -p "Enter configuration file to preload to disk (if any) -> " ETC_FILE
+	if [ -n "$ETC_FILE" ]; then
+		if [ ! -f "$ETC_FILE" ]; then
+			echo " No such file: \"$ETC_FILE\""
+			return 1
+		else
+			read -p "Enter seperate partition for configuration (recommended) or enter if same -> " ETC_PART
+			if [ -z "$ETC_PART" ]; then
+				ETC_PART=$PARTITION
+			elif [ ! -b "$ETC_PART" ]; then
+				echo " Can not find partition \"$ETC_PART\""
+				return 1
+			else
+				echo;echo -n "All data on device $ETC_PART will be lost, continue ? "
+				ask_yes_no || return 1
+
+				echo;echo -n "Last chance, do you really want to continue ? "
+				ask_yes_no || return 1
+
+				mkfs.ext2 $ETC_PART > /dev/null || return 1
+			fi
+		fi
+	fi
+
+	echo
+	echo "This will install DL on \"$DEVICE\" using the \"$BOOTLOADER\" bootloader. "
+
+	if [ "$BOOTLOADER" = "syslinux" ]; then
+  		echo "Please make sure the partition type is 'FAT16' (06) "
+		echo	
+	else
+		echo "Please make sure the partition type is 'Linux' (83) "
+		echo
+	fi
+
+	echo;echo -n "All data on device $PARTITION will be lost, continue ? "
+	ask_yes_no || return 1
 
 	echo;echo -n "Last chance, do you really want to continue ? "
-	ask_yes_no || return 0
+	ask_yes_no || return 1
 
 	if [ "$BOOTLOADER" = "syslinux" ]; then
-		mkfs.msdos $PARTITION || return 1
 
-		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
+		mkfs.msdos $PARTITION > /dev/null || return 1
 
-		echo installing MBR
-		SIZE=$(du -b ./tmp/mnt1/boot/syslinux/mbr.bin | cut -f 1 )
-		dd if=./tmp/mnt1/boot/syslinux/mbr.bin of=$DEVICE count=$SIZE || return 1
+		echo "Installing syslinux MBR"
+		SIZE=$(du -b $TMPDIR/iso-mnt/boot/syslinux/mbr.bin | cut -f 1 )
+		dd if=$TMPDIR/iso-mnt/boot/syslinux/mbr.bin of=$DEVICE count=$SIZE || return 1
 		echo installing SysLinux boot sector
-		./tmp/mnt1/boot/syslinux/syslinux-nomtools $PARTITION || return 1
+		$TMPDIR/iso-mnt/boot/syslinux/syslinux-nomtools $PARTITION || return 1
 
-		mount -t vfat $PARTITION ./tmp/mnt2 || return 1
+		mount -t vfat $PARTITION $TMPDIR/disk-mnt || return 1
 
-		echo copying files
-		cp ./tmp/mnt1/boot/* ./tmp/mnt2/ &> /dev/null
-		cp ./tmp/mnt1/{DEVIL-LINUX,LICENSE} ./tmp/mnt2/ &> /dev/null
-		cat ./tmp/mnt1/isolinux.cfg | sed -e s%"/boot/"%""% > ./tmp/mnt2/syslinux.cfg || return 1
-		cat ./tmp/mnt1/boot/message | sed -e s%"/boot/"%""% > ./tmp/mnt2/message || return 1
-		cp bootcd.iso ./tmp/mnt2/ || return 1
-	fi
+		echo "copying files"
+		cp -p $TMPDIR/iso-mnt/boot/* $TMPDIR/disk-mnt/ > /dev/null
+		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
+		cat $TMPDIR/iso-mnt/isolinux.cfg | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/syslinux.cfg || return 1
+		cat $TMPDIR/iso-mnt/boot/message | sed -e s%"/boot/"%""% > $TMPDIR/disk-mnt/message || return 1
+		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
 
-	if [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
-		mkfs.ext2 $PARTITION || return 1
+	elif [ "$BOOTLOADER" = "grub" ] || [ "$BOOTLOADER" = "lilo" ]; then
+
+		mkfs.ext2 $PARTITION > /dev/null || return 1
 		tune2fs -c 0 $PARTITION
 
-		mount -o loop -t iso9660 bootcd.iso ./tmp/mnt1 || return 1
-		mount -t auto $PARTITION ./tmp/mnt2 || return 1
+		mount -t auto $PARTITION $TMPDIR/disk-mnt || return 1
 
-		echo copying files...
-		nice -n19 cp -dpR ./tmp/mnt1/* ./tmp/mnt2/ || return 1
-		nice -n19 cp -dpR etc.tar.bz2 ./tmp/mnt2/ || return 1
+		echo "copying files"
+		cp -a $TMPDIR/iso-mnt/boot/ $TMPDIR/disk-mnt/ > /dev/null
+		cp -p $TMPDIR/iso-mnt/{DEVIL-LINUX,LICENSE} $TMPDIR/disk-mnt/ > /dev/null
+		copy_iso_file $DLISO $TMPDIR/disk-mnt/bootcd.iso || return 1	
+		GRUBPART=$(expr $(basename ${PARTITION} | sed -e 's/^part//' -e 's/^[hs]d[a-z]//') - 1)
 
 		[ "$BOOTLOADER" = "grub" ] && install_grub $DEVICE $GRUBPART
-		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE
+		[ "$BOOTLOADER" = "lilo" ] && install_lilo $DEVICE	
+
+	else
+		echo "Unknown Bootloader: $BOOTLOADER"
+		return 1
+	fi
+
+	if [ -n "$ETC_FILE" ]; then
+		mkdir -p $TMPDIR/etc-mnt
+		mount -t auto $ETC_PART $TMPDIR/etc-mnt
+		echo
+		echo "Copying $ETC_FILE to $TMPDIR/etc-mnt/etc.tar.bz2"
+		cp -p $ETC_FILE $TMPDIR/etc-mnt/etc.tar.bz2 > /dev/null || return 1
+		sync
+		umount $TMPDIR/etc-mnt > /dev/null
 	fi
+
+	return 0;
 }
 
-install
+##########################################################################
+
+echo
+echo "This will install the Devil Linux ISO image to a disk device (USB/SCSI/IDE)"
+echo "and make it bootable, assuming that your PC can boot this device."
+
+### Get some user info for the install
+echo
+echo "Select which bootloader you want to use:"
+echo " 1) SysLinux (default)"
+echo " 2) Grub"
+echo " 3) Lilo"
+ANS=""
+read -p "Choice: " -n 1 -rs ANS
+ANS=${ANS:-1}
+echo $ANS
+
+### set the default
+BOOTLOADER="syslinux"
+#BOOTLOADER="grub"
+#BOOTLOADER="lilo"
+
+[ ${ANS:-n} = "1" ] && BOOTLOADER="syslinux"
+[ ${ANS:-n} = "2" ] && BOOTLOADER="grub"
+[ ${ANS:-n} = "3" ] && BOOTLOADER="lilo"
+
+#### Choose the format used during build for initrd.gz:
+echo
+echo "Select correct initrd.gz format used (DL default is CramFS):"
+echo " 1) CramFS (default)"
+echo " 2) Ext2"
+ANS=""
+read -p "Choice: " -n 1 -rs ANS
+ANS=${ANS:-1}
+echo $ANS
+
+# For initrd.gz as CRAMFS
+RAMDISK="ramdisk_blocksize=4096"
+# For initrd.gz as EXT2
+#RAMDISK="ramdisk_blocksize=1024"
+
+[ ${ANS:-n} = "1" ] && RAMDISK="ramdisk_blocksize=4096";
+[ ${ANS:-n} = "2" ] && RAMDISK="ramdisk_blocksize=1024";
+
+# Do install
+install_dl || echo "Install failed!"
 
 echo "syncing and unmounting (this could take a while)"
 sync
-umount ./tmp/mnt1 || exit 1
-umount ./tmp/mnt2 || exit 1
+umount $TMPDIR/iso-mnt &> /dev/null
+umount $TMPDIR/disk-mnt &> /dev/null
+umount $TMPDIR/etc-mnt &> /dev/null
 
-rm -rf ./tmp || exit 1
+rm -rf $TMPDIR &> /dev/null
+
+exit

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 183 184 185 186 187 .. 253 > >> (Page 185 of 253)