[23923] in Source-Commits
/svn/athena r23533 - trunk/athena/bin/discuss/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Mar 5 15:41:29 2009
Date: Thu, 5 Mar 2009 15:40:43 -0500
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903052040.n25Kehre014473@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-05 15:40:43 -0500 (Thu, 05 Mar 2009)
New Revision: 23533
Modified:
trunk/athena/bin/discuss/debian/debathena-discuss-server.postinst
trunk/athena/bin/discuss/debian/debathena-discuss-server.postrm
trunk/athena/bin/discuss/debian/debathena-discuss-server.prerm
Log:
In debathena-discuss-server, update the logic that configures inetd to
match the athinfod and larvnet packaging.
Modified: trunk/athena/bin/discuss/debian/debathena-discuss-server.postinst
===================================================================
--- trunk/athena/bin/discuss/debian/debathena-discuss-server.postinst 2009-03-05 20:39:59 UTC (rev 23532)
+++ trunk/athena/bin/discuss/debian/debathena-discuss-server.postinst 2009-03-05 20:40:43 UTC (rev 23533)
@@ -23,10 +23,7 @@
if ! grep -q '^discuss[[:space:]]' /etc/services; then
echo "Discuss 2100/tcp # Networked conferencing." >>/etc/services
fi
- if dpkg --compare-version "$2" lt 10.0.7-0debathena3; then
- update-inetd --add \
- 'discuss\tstream\ttcp\tnowait\tdiscuss\t/usr/sbin/discussd'
- fi
+ update-inetd --add "discuss\tstream\ttcp\tnowait\tdiscuss\t/usr/sbin/discussd"
if ! getent passwd discuss >/dev/null; then
adduser --system --no-create-home --disabled-password --home /var/spool/discuss --gecos "Discuss server" --group discuss
fi
Modified: trunk/athena/bin/discuss/debian/debathena-discuss-server.postrm
===================================================================
--- trunk/athena/bin/discuss/debian/debathena-discuss-server.postrm 2009-03-05 20:39:59 UTC (rev 23532)
+++ trunk/athena/bin/discuss/debian/debathena-discuss-server.postrm 2009-03-05 20:40:43 UTC (rev 23533)
@@ -26,7 +26,12 @@
fi
;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ remove)
+ if hash update-inetd 2>/dev/null; then
+ update-inetd --remove "(#<off># )?discuss"
+ ;;
+
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
Modified: trunk/athena/bin/discuss/debian/debathena-discuss-server.prerm
===================================================================
--- trunk/athena/bin/discuss/debian/debathena-discuss-server.prerm 2009-03-05 20:39:59 UTC (rev 23532)
+++ trunk/athena/bin/discuss/debian/debathena-discuss-server.prerm 2009-03-05 20:40:43 UTC (rev 23533)
@@ -18,11 +18,14 @@
case "$1" in
- remove|deconfigure)
- update-inetd --remove 'discuss.*/usr/sbin/discussd'
+ remove)
+ update-inetd --disable discuss
;;
- upgrade|failed-upgrade)
+ upgrade|deconfigure)
+ ;;
+
+ |failed-upgrade)
;;
*)
