[Fusionforge-commits] r10811 - in branches/Branch_5_0/gforge: deb-specific debian packaging/install

Roland Mas lolando at libremir.placard.fr.eu.org
Sun Oct 3 15:20:14 CEST 2010


Author: lolando
Date: 2010-10-03 15:20:14 +0200 (Sun, 03 Oct 2010)
New Revision: 10811

Modified:
   branches/Branch_5_0/gforge/deb-specific/install-chroot.sh
   branches/Branch_5_0/gforge/debian/changelog
   branches/Branch_5_0/gforge/packaging/install/shell-postgresql
Log:
Support rsyslog as well as syslogd

Modified: branches/Branch_5_0/gforge/deb-specific/install-chroot.sh
===================================================================
--- branches/Branch_5_0/gforge/deb-specific/install-chroot.sh	2010-10-03 13:10:30 UTC (rev 10810)
+++ branches/Branch_5_0/gforge/deb-specific/install-chroot.sh	2010-10-03 13:20:14 UTC (rev 10811)
@@ -85,7 +85,9 @@
 	[ -c $CHROOTDIR/dev/urandom ] || mknod $CHROOTDIR/dev/urandom c 1 9 || true
 	[ -c $CHROOTDIR/dev/console ] || mknod $CHROOTDIR/dev/console c 5 1 || true
 	# For /dev/log
-	if ! grep -q "^SYSLOGD.*/var/lib/gforge/chroot/dev/log.*" /etc/default/syslogd ; then 
+	if [ -e /etc/default/syslogd ] \
+	    && [ ! -e /etc/rsyslog.conf ] \
+	    && ! grep -q "^SYSLOGD.*/var/lib/gforge/chroot/dev/log.*" /etc/default/syslogd ; then 
 		echo '######################################################################################################'
 		echo 'WARNING: you must have SYSLOGD="-p /dev/log -a /var/lib/gforge/chroot/dev/log" in /etc/default/syslogd'
 		echo 'To have cvs pserver running correctly'

Modified: branches/Branch_5_0/gforge/debian/changelog
===================================================================
--- branches/Branch_5_0/gforge/debian/changelog	2010-10-03 13:10:30 UTC (rev 10810)
+++ branches/Branch_5_0/gforge/debian/changelog	2010-10-03 13:20:14 UTC (rev 10811)
@@ -5,8 +5,9 @@
   * Update roadmap URL (closes: #597847).
   * Fix detection of PostgreSQL's init script (closes: #596929).
   * Updated Portuguese Debconf translations (closes: #597354).
+  * Support rsyslog as well as syslogd (closes: 535580).
 
- -- Roland Mas <lolando at debian.org>  Sun, 03 Oct 2010 15:09:49 +0200
+ -- Roland Mas <lolando at debian.org>  Sun, 03 Oct 2010 15:19:44 +0200
 
 fusionforge (5.0.2-1) unstable; urgency=low
 

Modified: branches/Branch_5_0/gforge/packaging/install/shell-postgresql
===================================================================
--- branches/Branch_5_0/gforge/packaging/install/shell-postgresql	2010-10-03 13:10:30 UTC (rev 10810)
+++ branches/Branch_5_0/gforge/packaging/install/shell-postgresql	2010-10-03 13:20:14 UTC (rev 10811)
@@ -1 +1,2 @@
+deb-specific/fusionforge.rsyslog etc/rsyslog.d/
 utils/install-nsspgsql.sh usr/share/gforge/bin/




More information about the Fusionforge-commits mailing list