Author: julien
Date: 2007-01-21 14:43:15 -0500 (Sun, 21 Jan 2007)
New Revision: 4212
Added:
branches/etch/app/xdm/
Modified:
branches/etch/app/xdm/debian/changelog
branches/etch/app/xdm/debian/xdm.postinst.in
Log:
* New xdm branch for etch.
* In postinst, don't check if xdm is running on initial install, because that
breaks in d-i, which uses a fake start-stop-daemon (closes: #407342).
Copied: branches/etch/app/xdm (from rev 4208, tags/app/xdm/xdm-1:1.0.5-1)
Modified: branches/etch/app/xdm/debian/changelog
===================================================================
--- tags/app/xdm/xdm-1:1.0.5-1/debian/changelog 2007-01-15 01:05:16 UTC (rev
4208)
+++ branches/etch/app/xdm/debian/changelog 2007-01-21 19:43:15 UTC (rev
4212)
@@ -1,3 +1,11 @@
+xdm (1:1.0.5-2) unstable; urgency=low
+
+ * On initial install, don't check if xdm is already running, because
+ start-stop-daemon in d-i always returns true (closes: #407342). Thanks to
+ Joey Hess for the report.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 21 Jan 2007 17:59:53 +0100
+
xdm (1:1.0.5-1) unstable; urgency=high
[ Eugene Konev ]
Modified: branches/etch/app/xdm/debian/xdm.postinst.in
===================================================================
--- tags/app/xdm/xdm-1:1.0.5-1/debian/xdm.postinst.in 2007-01-15 01:05:16 UTC
(rev 4208)
+++ branches/etch/app/xdm/debian/xdm.postinst.in 2007-01-21 19:43:15 UTC
(rev 4212)
@@ -95,8 +95,9 @@
# (which we can only do if the daemon isn't running).
DENYSTART=
-# Don't start the daemon if it's already running...
-if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/xdm.pid \
+# On upgrades, don't start the daemon if it's already running...
+if ( [ "$1" != install ] || [ -n "$2" ] ) && \
+ start-stop-daemon --stop --quiet --signal 0 --pid /var/run/xdm.pid \
--name $(basename $DAEMON) ; then
# Note our refusal to start the daemon if we were supposed to start it.
[ -n "$NOSTART" ] || DENYSTART=yes
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
