From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-107428-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1L8NFj-0006XT-04
	for garchives@archives.gentoo.org; Thu, 04 Dec 2008 23:04:59 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2FBC3E0598;
	Thu,  4 Dec 2008 23:04:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 0DAFCE0598
	for <gentoo-commits@lists.gentoo.org>; Thu,  4 Dec 2008 23:04:58 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id B3938649F3
	for <gentoo-commits@lists.gentoo.org>; Thu,  4 Dec 2008 23:04:57 +0000 (UTC)
Received: from ulm by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <ulm@stork.gentoo.org>)
	id 1L8NFh-0008Aj-9M
	for gentoo-commits@lists.gentoo.org; Thu, 04 Dec 2008 23:04:57 +0000
To: gentoo-commits@lists.gentoo.org
From: "Ulrich Mueller (ulm)" <ulm@gentoo.org>
Subject: [gentoo-commits] emacs r1167 - emacs-daemon
X-VCS-Repository: emacs
X-VCS-Revision: 1167
X-VCS-Files: emacs-daemon/ChangeLog emacs-daemon/emacs.rc
X-VCS-Directories: emacs-daemon
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Mueller
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1L8NFh-0008Aj-9M@stork.gentoo.org>
Sender: Ulrich Mueller <ulm@stork.gentoo.org>
Date: Thu, 04 Dec 2008 23:04:57 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 150caf55-c925-4491-b089-e2c3a92ef265
X-Archives-Hash: d884487e7832462333681a01a04e9af0

Author: ulm
Date: 2008-12-04 23:04:56 +0000 (Thu, 04 Dec 2008)
New Revision: 1167

Modified:
   emacs-daemon/ChangeLog
   emacs-daemon/emacs.rc
Log:
Call start-stop-daemon with --background option.

Modified: emacs-daemon/ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- emacs-daemon/ChangeLog	2008-12-03 07:05:06 UTC (rev 1166)
+++ emacs-daemon/ChangeLog	2008-12-04 23:04:56 UTC (rev 1167)
@@ -1,6 +1,7 @@
 2008-12-03  Ulrich Mueller  <ulm@gentoo.org>
=20
 	* emacs.rc (checkconfig): Use numerical user id for root.
+	(start): Call start-stop-daemon with --background option.
=20
 2008-11-30  Ulrich Mueller  <ulm@gentoo.org>
=20

Modified: emacs-daemon/emacs.rc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- emacs-daemon/emacs.rc	2008-12-03 07:05:06 UTC (rev 1166)
+++ emacs-daemon/emacs.rc	2008-12-04 23:04:56 UTC (rev 1167)
@@ -41,8 +41,12 @@
=20
     ebegin "Starting Emacs daemon for ${USER}"
     eval home=3D"~${USER}"
-    start-stop-daemon --start --user "${USER}" --chdir "${home}" \
-	--quiet --pidfile "${PIDFILE}" --env EMACS=3D"${EMACS}" \
+
+    # Emacs detaches and exits the parent process only after loading the
+    # user's .emacs (initialisation). Anything may happen there, so we
+    # use --background to ensure that start-stop-daemon doesn't hang.
+    start-stop-daemon --start --user "${USER}" --chdir "${home}" --quiet=
 \
+	--background --pidfile "${PIDFILE}" --env EMACS=3D"${EMACS}" \
 	--exec "${EMACS_START:-${EMACS}}" -- --daemon ${EMACS_OPTS}
     eend $?
 }