From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6EDE6198005 for ; Sat, 23 Mar 2013 22:08:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8FB0E07B1; Sat, 23 Mar 2013 22:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 723B2E07AE for ; Sat, 23 Mar 2013 22:08:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 871D033D806 for ; Sat, 23 Mar 2013 22:08:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 251F6E4073 for ; Sat, 23 Mar 2013 22:08:55 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1364039542.bed97d1e77dd5161fc8513a156e85e334e987ea1.ulm@gentoo> Subject: [gentoo-commits] proj/emacs-tools:emacs-daemon commit in: / X-VCS-Repository: proj/emacs-tools X-VCS-Files: ChangeLog emacs.rc X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: bed97d1e77dd5161fc8513a156e85e334e987ea1 X-VCS-Branch: emacs-daemon Date: Sat, 23 Mar 2013 22:08:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d3dfa92c-608c-41b5-8b42-79c95655205a X-Archives-Hash: 17351d4b8e8e2c9cbf9ccecb5b86a3ad commit: bed97d1e77dd5161fc8513a156e85e334e987ea1 Author: Ulrich Müller gentoo org> AuthorDate: Sat Mar 23 11:52:22 2013 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sat Mar 23 11:52:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bed97d1e Specify retry schedule for stop. * emacs.rc (stop): Specify retry schedule for start-stop-daemon: Send SIGTERM, wait for EMACS_TIMEOUT, then send SIGKILL. --- ChangeLog | 5 +++++ emacs.rc | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 452eaa0..80137ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-03-23 Ulrich Müller + + * emacs.rc (stop): Specify retry schedule for start-stop-daemon: + Send SIGTERM, wait for EMACS_TIMEOUT, then send SIGKILL. + 2012-07-21 Ulrich Müller * Version 0.19 released. diff --git a/emacs.rc b/emacs.rc index 67ddd2d..8bef6da 100644 --- a/emacs.rc +++ b/emacs.rc @@ -74,7 +74,7 @@ stop() { fi ebegin "Stopping Emacs daemon for user ${USER}" - start-stop-daemon --stop \ + start-stop-daemon --stop --retry "TERM/${EMACS_TIMEOUT}/KILL/5" \ --user "${USER}" --pidfile "${PIDFILE}" --exec "${EMACS}" eend $? }